r24874: Fix double free of smbcli_tree.
authorJelmer Vernooij <jelmer@samba.org>
Sat, 1 Sep 2007 23:25:44 +0000 (23:25 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 20:03:25 +0000 (15:03 -0500)
(This used to be commit 84f14b5dd042f8805e69ad455b222a76614dbe21)

source4/torture/basic/base.c
source4/torture/basic/scanner.c

index bfe1e082f119b765e74cd37ac97b4f0f5a8c4c17..9b2bb14106ea622c662b4db5238b964375852589 100644 (file)
@@ -1712,8 +1712,7 @@ static BOOL torture_samba3_errorpaths(struct torture_context *tctx)
 
 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 @@ NTSTATUS torture_base_init(void)
        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);
index 0a1cfc2e01b0e3d693cadfa33920f23253257c61..f68674911f403a2056df54cc7a4c2f2154967bfc 100644 (file)
@@ -473,8 +473,8 @@ static BOOL scan_nttrans(struct smbcli_state *cli, int op, int level,
 }
 
 
-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 @@ BOOL torture_nttrans_scan(struct torture_context *torture,
                }
        }
 
-       torture_close_connection(cli);
-
        printf("nttrans scan finished\n");
        return True;
 }