s3:torture/test_smb2: make a copy of smbXcli_tcon

[kai/samba.git] / source3 / torture / test_smb2.c

diff --git a/source3/torture/test_smb2.c b/source3/torture/test_smb2.c
index a03e1cf985397492b44b5f922d3bffc0333f176f..657883bb439f76b0669f4405368ed101ba84030a 100644 (file)
--- a/source3/torture/test_smb2.c
+++ b/source3/torture/test_smb2.c
@@ -41,6 +41,7 @@ bool run_smb2_basic(int dummy)
        uint8_t *dir_data;
        uint32_t dir_data_length;
        uint32_t saved_tid = 0;
+       struct smbXcli_tcon *saved_tcon = NULL;
        uint64_t saved_uid = 0;
 
        printf("Starting SMB2-BASIC\n");
@@ -152,7 +153,7 @@ bool run_smb2_basic(int dummy)
        }
 
        status = smb2cli_query_directory(
-               cli->conn, cli->timeout, cli->smb2.session, cli->smb2.tid,
+               cli->conn, cli->timeout, cli->smb2.session, cli->smb2.tcon,
                1, 0, 0, fid_persistent, fid_volatile, "*", 0xffff,
                talloc_tos(), &dir_data, &dir_data_length);
 
@@ -169,11 +170,21 @@ bool run_smb2_basic(int dummy)
        }
 
        saved_tid = cli->smb2.tid;
+       saved_tcon = cli->smb2.tcon;
+       cli->smb2.tcon = smbXcli_tcon_create(cli);
+       smb2cli_tcon_set_values(cli->smb2.tcon,
+                               saved_tid,
+                               0, /* type */
+                               0, /* flags */
+                               0, /* capabilities */
+                               0  /* maximal_access */);
        status = smb2cli_tdis(cli);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_tdis returned %s\n", nt_errstr(status));
                return false;
        }
+       talloc_free(cli->smb2.tcon);
+       cli->smb2.tcon = saved_tcon;
        cli->smb2.tid = saved_tid;
 
        status = smb2cli_tdis(cli);
@@ -1444,6 +1455,7 @@ bool run_smb2_session_reauth(int dummy)
        struct auth_generic_state *auth_generic_state;
        struct iovec *recv_iov;
        uint32_t saved_tid;
+       struct smbXcli_tcon *saved_tcon;
 
        printf("Starting SMB2-SESSION_REAUTH\n");
 
@@ -1517,7 +1529,7 @@ bool run_smb2_session_reauth(int dummy)
        }
 
        status = smb2cli_query_directory(
-               cli->conn, cli->timeout, cli->smb2.session, cli->smb2.tid,
+               cli->conn, cli->timeout, cli->smb2.session, cli->smb2.tcon,
                1, 0x3, 0, dir_persistent, dir_volatile,
                "session-reauth.txt", 0xffff,
                talloc_tos(), &dir_data, &dir_data_length);
@@ -1612,7 +1624,7 @@ bool run_smb2_session_reauth(int dummy)
        }
 
        status = smb2cli_query_directory(
-               cli->conn, cli->timeout, cli->smb2.session, cli->smb2.tid,
+               cli->conn, cli->timeout, cli->smb2.session, cli->smb2.tcon,
                1, 0x3, 0, dir_persistent, dir_volatile,
                "session-reauth.txt", 0xffff,
                talloc_tos(), &dir_data, &dir_data_length);
@@ -1719,11 +1731,21 @@ bool run_smb2_session_reauth(int dummy)
        }
 
        saved_tid = cli->smb2.tid;
+       saved_tcon = cli->smb2.tcon;
+       cli->smb2.tcon = smbXcli_tcon_create(cli);
+       smb2cli_tcon_set_values(cli->smb2.tcon,
+                               saved_tid,
+                               0, /* type */
+                               0, /* flags */
+                               0, /* capabilities */
+                               0  /* maximal_access */);
        status = cli_tree_connect(cli, share, "?????", "", 0);
        if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_HANDLE)) {
                printf("cli_tree_connect returned %s\n", nt_errstr(status));
                return false;
        }
+       talloc_free(cli->smb2.tcon);
+       cli->smb2.tcon = saved_tcon;
        cli->smb2.tid = saved_tid;
 
        subreq = smb2cli_session_setup_send(talloc_tos(), ev,
@@ -1864,7 +1886,7 @@ bool run_smb2_session_reauth(int dummy)
        }
 
        status = smb2cli_query_directory(
-               cli->conn, cli->timeout, cli->smb2.session, cli->smb2.tid,
+               cli->conn, cli->timeout, cli->smb2.session, cli->smb2.tcon,
                1, 0x3, 0, dir_persistent, dir_volatile,
                "session-reauth.txt", 0xffff,
                talloc_tos(), &dir_data, &dir_data_length);
@@ -1888,11 +1910,21 @@ bool run_smb2_session_reauth(int dummy)
        }
 
        saved_tid = cli->smb2.tid;
+       saved_tcon = cli->smb2.tcon;
+       cli->smb2.tcon = smbXcli_tcon_create(cli);
+       smb2cli_tcon_set_values(cli->smb2.tcon,
+                               saved_tid,
+                               0, /* type */
+                               0, /* flags */
+                               0, /* capabilities */
+                               0  /* maximal_access */);
        status = cli_tree_connect(cli, share, "?????", "", 0);
        if (!NT_STATUS_IS_OK(status)) {
                printf("cli_tree_connect returned %s\n", nt_errstr(status));
                return false;
        }
+       talloc_free(cli->smb2.tcon);
+       cli->smb2.tcon = saved_tcon;
        cli->smb2.tid = saved_tid;
 
        return true;