The branch, master has been updated
via 3e6661fd73b s4 librpc rpc pyrpc: Fix flapping dcerpc.bare tests
from 03cbef2beff lib:crypto: Remove obsolete MD5 and HMAC MD5
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3e6661fd73bb24ef5700a98f676f1df5eeca408b
Author: Gary Lockyer <[email protected]>
Date: Wed May 22 11:43:54 2019 +1200
s4 librpc rpc pyrpc: Fix flapping dcerpc.bare tests
Commit d65b7641c84976c543ded8f0de5ab2da3c19b407 had the parameters to
talloc_reparent reversed. This caused the dcerpc.bare tests to flap.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13932
Signed-off-by: Gary Lockyer <[email protected]>
Reviewed-by: Andrew Bartlett <[email protected]>
Autobuild-User(master): Gary Lockyer <[email protected]>
Autobuild-Date(master): Wed May 22 03:03:43 UTC 2019 on sn-devel-184
-----------------------------------------------------------------------
Summary of changes:
source4/librpc/rpc/pyrpc.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/librpc/rpc/pyrpc.c b/source4/librpc/rpc/pyrpc.c
index 09f3e32074b..5d10201bb70 100644
--- a/source4/librpc/rpc/pyrpc.c
+++ b/source4/librpc/rpc/pyrpc.c
@@ -305,12 +305,9 @@ static void dcerpc_interface_dealloc(PyObject* self)
{
dcerpc_InterfaceObject *interface = (dcerpc_InterfaceObject *)self;
- /*
- * This can't fail, and if it did talloc_unlink(NULL, NULL) is
- * harmless below
- */
struct tevent_context *ev_save = talloc_reparent(
- NULL, interface->mem_ctx, interface->ev);
+ interface->mem_ctx, NULL, interface->ev);
+ SMB_ASSERT(ev_save != NULL);
interface->binding_handle = NULL;
interface->pipe = NULL;
--
Samba Shared Repository
