]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3: smbtorture: Show correct use of cli_state_save_tcon() / cli_state_restore_tcon().
authorJeremy Allison <jra@samba.org>
Tue, 13 Jun 2017 23:25:25 +0000 (16:25 -0700)
committerKarolin Seeger <kseeger@samba.org>
Fri, 30 Jun 2017 08:46:22 +0000 (10:46 +0200)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12831

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
(cherry picked from commit 5c0efc9a5ef8ddf96dc394110063bebd5f057415)

source3/torture/test_smb2.c

index 4db8c772b5308d2dbe7c812281abed0b497e7f3e..da10461f918f1e5a1c53f699e5d6dbece08a97b4 100644 (file)
@@ -172,7 +172,10 @@ bool run_smb2_basic(int dummy)
        }
 
        saved_tid = smb2cli_tcon_current_id(cli->smb2.tcon);
-       saved_tcon = cli->smb2.tcon;
+       saved_tcon = cli_state_save_tcon(cli);
+       if (saved_tcon == NULL) {
+               return false;
+       }
        cli->smb2.tcon = smbXcli_tcon_create(cli);
        smb2cli_tcon_set_values(cli->smb2.tcon,
                                NULL, /* session */
@@ -189,8 +192,7 @@ bool run_smb2_basic(int dummy)
                printf("smb2cli_tdis returned %s\n", nt_errstr(status));
                return false;
        }
-       talloc_free(cli->smb2.tcon);
-       cli->smb2.tcon = saved_tcon;
+       cli_state_restore_tcon(cli, saved_tcon);
 
        status = smb2cli_tdis(cli->conn,
                              cli->timeout,