]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s4 librpc rpc pyrpc: Fix flapping dcerpc.bare tests
authorGary Lockyer <gary@catalyst.net.nz>
Tue, 21 May 2019 23:43:54 +0000 (11:43 +1200)
committerGary Lockyer <gary@samba.org>
Wed, 22 May 2019 03:03:43 +0000 (03:03 +0000)
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 <gary@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Gary Lockyer <gary@samba.org>
Autobuild-Date(master): Wed May 22 03:03:43 UTC 2019 on sn-devel-184

source4/librpc/rpc/pyrpc.c

index 09f3e32074bb71ded79089dcf6076ebbbc5775e9..5d10201bb7072c3270465b65c3ce5e08d979f66c 100644 (file)
@@ -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;