r17959: sync with samba4

metze
(This used to be commit 69a7a83b103adb1494c15a96318aa34ebd354749)

diff --git a/source3/lib/talloctort.c b/source3/lib/talloctort.c
index 013f01cc2cfdf606df224f618767834011c0e7f7..ca5e9042d349ce5130fb5677d9a4fed9ca4a30d7 100644 (file)
--- a/source3/lib/talloctort.c
+++ b/source3/lib/talloctort.c
@@ -910,6 +910,7 @@ static BOOL test_loop(void)
                printf("FAILED TO FIRE LOOP DESTRUCTOR\n");
                return False;
        }
+       loop_destructor_count = 0;
 
        return True;
 }
@@ -1021,6 +1022,7 @@ BOOL torture_local_talloc(struct torture_context *torture)
 {
        BOOL ret = True;
 
+       talloc_disable_null_tracking();
        talloc_enable_null_tracking();
 
        ret &= test_ref1();