svn commit: samba r24874 - in branches/SAMBA_4_0: . source/torture/basic

[jelmer at samba.org]

Author: jelmer
Date: 2007-09-01 23:25:44 +0000 (Sat, 01 Sep 2007)
New Revision: 24874

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24874

Log:
Fix double free of smbcli_tree.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/torture/basic/base.c
   branches/SAMBA_4_0/source/torture/basic/scanner.c


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/torture/basic/base.c
===================================================================
--- branches/SAMBA_4_0/source/torture/basic/base.c	2007-09-01 23:11:48 UTC (rev 24873)
+++ branches/SAMBA_4_0/source/torture/basic/base.c	2007-09-01 23:25:44 UTC (rev 24874)
@@ -1712,8 +1712,7 @@
 
 NTSTATUS torture_base_init(void)
 {
-	struct torture_suite *suite = torture_suite_create(
-									talloc_autofree_context(), "BASE");
+	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "BASE");
 
 	torture_suite_add_2smb_test(suite, "FDPASS", run_fdpasstest);
 	torture_suite_add_suite(suite, torture_base_locktest());
@@ -1747,8 +1746,7 @@
 	torture_suite_add_1smb_test(suite, "SECLEAK",  torture_sec_leak);
 	torture_suite_add_simple_test(suite, "DISCONNECT",  torture_disconnect);
 	torture_suite_add_suite(suite, torture_delay_write());
-	torture_suite_add_simple_test(suite, "SAMBA3ERROR", 
-								  torture_samba3_errorpaths);
+	torture_suite_add_simple_test(suite, "SAMBA3ERROR", torture_samba3_errorpaths);
 	torture_suite_add_1smb_test(suite, "CASETABLE", torture_casetable);
 	torture_suite_add_1smb_test(suite, "UTABLE", torture_utable);
 	torture_suite_add_simple_test(suite, "SMB", torture_smb_scan);

Modified: branches/SAMBA_4_0/source/torture/basic/scanner.c
===================================================================
--- branches/SAMBA_4_0/source/torture/basic/scanner.c	2007-09-01 23:11:48 UTC (rev 24873)
+++ branches/SAMBA_4_0/source/torture/basic/scanner.c	2007-09-01 23:25:44 UTC (rev 24874)
@@ -473,8 +473,8 @@
 }
 
 
-BOOL torture_nttrans_scan(struct torture_context *torture, 
-						  struct smbcli_state *cli)
+bool torture_nttrans_scan(struct torture_context *torture, 
+			  struct smbcli_state *cli)
 {
 	int op, level;
 	const char *fname = "\\scanner.dat";
@@ -499,8 +499,6 @@
 		}
 	}
 
-	torture_close_connection(cli);
-
 	printf("nttrans scan finished\n");
 	return True;
 }