From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 31 Aug 2006 09:27:03 +0000 (+0000)
Subject: r17959: sync with samba4
X-Git-Tag: samba-4.0.0alpha6~801^2~7763
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c07bd61dc75529940bb55697a6c11920816ecbd;p=thirdparty%2Fsamba.git

r17959: sync with samba4

metze
(This used to be commit 69a7a83b103adb1494c15a96318aa34ebd354749)
---

diff --git a/source3/lib/talloctort.c b/source3/lib/talloctort.c
index 013f01cc2cf..ca5e9042d34 100644
--- 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();