diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-09-01 23:25:44 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:03:25 -0500 |
| commit | 4fe2da62796e3c46497a9aa5b3e37890b6d0dd9c (patch) | |
| tree | 24da0c6a517c774fe64a8ccd47fabab751d57a1b | |
| parent | c09c89a8a7ca5769fb8c0995779b9134f1618cf0 (diff) | |
| download | samba-4fe2da62796e3c46497a9aa5b3e37890b6d0dd9c.tar.gz samba-4fe2da62796e3c46497a9aa5b3e37890b6d0dd9c.tar.bz2 samba-4fe2da62796e3c46497a9aa5b3e37890b6d0dd9c.zip | |
r24874: Fix double free of smbcli_tree.
(This used to be commit 84f14b5dd042f8805e69ad455b222a76614dbe21)
| -rw-r--r-- | source4/torture/basic/base.c | 6 | ||||
| -rw-r--r-- | source4/torture/basic/scanner.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c index bfe1e082f1..9b2bb14106 100644 --- a/source4/torture/basic/base.c +++ b/source4/torture/basic/base.c @@ -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); diff --git a/source4/torture/basic/scanner.c b/source4/torture/basic/scanner.c index 0a1cfc2e01..f68674911f 100644 --- a/source4/torture/basic/scanner.c +++ b/source4/torture/basic/scanner.c @@ -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; } |