summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-08-31 09:27:03 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:39:44 -0500
commit7c07bd61dc75529940bb55697a6c11920816ecbd (patch)
treebe9df8877ec88aa51422b3d57fe996629d9731f3 /source3
parent5e7ead245cc4b98b4d7742afb557d9b32c4b73b9 (diff)
downloadsamba-7c07bd61dc75529940bb55697a6c11920816ecbd.tar.gz
samba-7c07bd61dc75529940bb55697a6c11920816ecbd.tar.bz2
samba-7c07bd61dc75529940bb55697a6c11920816ecbd.zip
r17959: sync with samba4
metze (This used to be commit 69a7a83b103adb1494c15a96318aa34ebd354749)
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/talloctort.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source3/lib/talloctort.c b/source3/lib/talloctort.c
index 013f01cc2c..ca5e9042d3 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();