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 69776f44962ae9ba0f8c0c627ef6d47c092c4d98..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");
@@ -72,7 +73,8 @@ bool run_smb2_basic(int dummy)
                return false;
        }
 
-       status = smb2cli_create(cli, "smb2-basic.txt",
+       status = smb2cli_create(cli->conn, cli->timeout, cli->smb2.session,
+                       cli->smb2.tcon, "smb2-basic.txt",
                        SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
                        SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
                        SEC_STD_ALL | SEC_FILE_ALL, /* desired_access, */
@@ -88,22 +90,25 @@ bool run_smb2_basic(int dummy)
                return false;
        }
 
-       status = smb2cli_write(cli, strlen(hello), 0, fid_persistent,
+       status = smb2cli_write(cli->conn, cli->timeout, cli->smb2.session,
+                              cli->smb2.tcon, strlen(hello), 0, fid_persistent,
                               fid_volatile, 0, 0, (const uint8_t *)hello);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_write returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = smb2cli_flush(cli, fid_persistent, fid_volatile);
+       status = smb2cli_flush(cli->conn, cli->timeout, cli->smb2.session,
+                              cli->smb2.tcon, fid_persistent, fid_volatile);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_flush returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = smb2cli_read(cli, 0x10000, 0, fid_persistent,
-                              fid_volatile, 2, 0,
-                              talloc_tos(), &result, &nread);
+       status = smb2cli_read(cli->conn, cli->timeout, cli->smb2.session,
+                             cli->smb2.tcon, 0x10000, 0, fid_persistent,
+                             fid_volatile, 2, 0,
+                             talloc_tos(), &result, &nread);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_read returned %s\n", nt_errstr(status));
                return false;
@@ -121,13 +126,15 @@ bool run_smb2_basic(int dummy)
                return false;
        }
 
-       status = smb2cli_close(cli, 0, fid_persistent, fid_volatile);
+       status = smb2cli_close(cli->conn, cli->timeout, cli->smb2.session,
+                              cli->smb2.tcon, 0, fid_persistent, fid_volatile);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_close returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = smb2cli_create(cli, "",
+       status = smb2cli_create(cli->conn, cli->timeout, cli->smb2.session,
+                       cli->smb2.tcon, "",
                        SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
                        SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
                        SEC_STD_SYNCHRONIZE|
@@ -146,7 +153,8 @@ bool run_smb2_basic(int dummy)
        }
 
        status = smb2cli_query_directory(
-               cli, 1, 0, 0, fid_persistent, fid_volatile, "*", 0xffff,
+               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);
 
        if (!NT_STATUS_IS_OK(status)) {
@@ -154,18 +162,29 @@ bool run_smb2_basic(int dummy)
                return false;
        }
 
-       status = smb2cli_close(cli, 0, fid_persistent, fid_volatile);
+       status = smb2cli_close(cli->conn, cli->timeout, cli->smb2.session,
+                              cli->smb2.tcon, 0, fid_persistent, fid_volatile);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_close returned %s\n", nt_errstr(status));
                return false;
        }
 
        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);
@@ -175,7 +194,7 @@ bool run_smb2_basic(int dummy)
        }
 
        saved_uid = smb2cli_session_current_id(cli->smb2.session);
-       status = smb2cli_logoff(cli);
+       status = smb2cli_logoff(cli->conn, cli->timeout, cli->smb2.session);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_logoff returned %s\n", nt_errstr(status));
                return false;
@@ -189,7 +208,7 @@ bool run_smb2_basic(int dummy)
 
        smb2cli_session_set_id_and_flags(cli->smb2.session, saved_uid, 0);
 
-       status = smb2cli_logoff(cli);
+       status = smb2cli_logoff(cli->conn, cli->timeout, cli->smb2.session);
        if (!NT_STATUS_EQUAL(status, NT_STATUS_USER_SESSION_DELETED)) {
                printf("2nd smb2cli_logoff returned %s\n", nt_errstr(status));
                return false;
@@ -314,7 +333,8 @@ bool run_smb2_session_reconnect(int dummy)
                return false;
        }
 
-       status = smb2cli_create(cli1, "session-reconnect.txt",
+       status = smb2cli_create(cli1->conn, cli1->timeout, cli1->smb2.session,
+                       cli1->smb2.tcon, "session-reconnect.txt",
                        SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
                        SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
                        SEC_STD_ALL | SEC_FILE_ALL, /* desired_access, */
@@ -330,22 +350,25 @@ bool run_smb2_session_reconnect(int dummy)
                return false;
        }
 
-       status = smb2cli_write(cli1, strlen(hello), 0, fid_persistent,
+       status = smb2cli_write(cli1->conn, cli1->timeout, cli1->smb2.session,
+                              cli1->smb2.tcon, strlen(hello), 0, fid_persistent,
                               fid_volatile, 0, 0, (const uint8_t *)hello);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_write returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = smb2cli_flush(cli1, fid_persistent, fid_volatile);
+       status = smb2cli_flush(cli1->conn, cli1->timeout, cli1->smb2.session,
+                              cli1->smb2.tcon, fid_persistent, fid_volatile);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_flush returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = smb2cli_read(cli1, 0x10000, 0, fid_persistent,
-                              fid_volatile, 2, 0,
-                              talloc_tos(), &result, &nread);
+       status = smb2cli_read(cli1->conn, cli1->timeout, cli1->smb2.session,
+                             cli1->smb2.tcon, 0x10000, 0, fid_persistent,
+                             fid_volatile, 2, 0,
+                             talloc_tos(), &result, &nread);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_read returned %s\n", nt_errstr(status));
                return false;
@@ -497,7 +520,8 @@ bool run_smb2_session_reconnect(int dummy)
 
        /* check file operation on the old client */
 
-       status = smb2cli_flush(cli1, fid_persistent, fid_volatile);
+       status = smb2cli_flush(cli1->conn, cli1->timeout, cli1->smb2.session,
+                              cli1->smb2.tcon, fid_persistent, fid_volatile);
        if (!NT_STATUS_EQUAL(status, NT_STATUS_USER_SESSION_DELETED)) {
                printf("smb2cli_flush returned %s\n", nt_errstr(status));
                return false;
@@ -514,28 +538,38 @@ bool run_smb2_session_reconnect(int dummy)
         * on w2k8r2 at least, flush, read and write also work the same way,
         * while create gives ACCESS_DENIED without signing
         */
-       status = smb2cli_flush(cli2, fid_persistent, fid_volatile);
-       if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED)) {
+       status = smb2cli_flush(cli2->conn, cli2->timeout, cli2->smb2.session,
+                              cli2->smb2.tcon, fid_persistent, fid_volatile);
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED) &&
+           !NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_NAME_DELETED))
+       {
                printf("smb2cli_flush returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = smb2cli_write(cli2, strlen(hello), 0, fid_persistent,
+       status = smb2cli_write(cli2->conn, cli2->timeout, cli2->smb2.session,
+                              cli2->smb2.tcon, strlen(hello), 0, fid_persistent,
                               fid_volatile, 0, 0, (const uint8_t *)hello);
-       if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED)) {
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED) &&
+           !NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_NAME_DELETED))
+       {
                printf("smb2cli_write returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = smb2cli_read(cli2, 0x10000, 0, fid_persistent,
-                              fid_volatile, 2, 0,
-                              talloc_tos(), &result, &nread);
-       if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED)) {
+       status = smb2cli_read(cli2->conn, cli2->timeout, cli2->smb2.session,
+                             cli2->smb2.tcon, 0x10000, 0, fid_persistent,
+                             fid_volatile, 2, 0,
+                             talloc_tos(), &result, &nread);
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED) &&
+           !NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_NAME_DELETED))
+       {
                printf("smb2cli_read returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = smb2cli_create(cli2, "session-reconnect.txt",
+       status = smb2cli_create(cli2->conn, cli2->timeout, cli2->smb2.session,
+                       cli2->smb2.tcon, "session-reconnect.txt",
                        SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
                        SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
                        SEC_STD_ALL | SEC_FILE_ALL, /* desired_access, */
@@ -566,28 +600,38 @@ bool run_smb2_session_reconnect(int dummy)
 
        cli2->smb2.tid = cli1->smb2.tid;
 
-       status = smb2cli_flush(cli2, fid_persistent, fid_volatile);
-       if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED)) {
+       status = smb2cli_flush(cli2->conn, cli2->timeout, cli2->smb2.session,
+                              cli2->smb2.tcon, fid_persistent, fid_volatile);
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED) &&
+           !NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_NAME_DELETED))
+       {
                printf("smb2cli_flush returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = smb2cli_write(cli2, strlen(hello), 0, fid_persistent,
+       status = smb2cli_write(cli2->conn, cli2->timeout, cli2->smb2.session,
+                              cli2->smb2.tcon, strlen(hello), 0, fid_persistent,
                               fid_volatile, 0, 0, (const uint8_t *)hello);
-       if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED)) {
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED) &&
+           !NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_NAME_DELETED))
+       {
                printf("smb2cli_write returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = smb2cli_read(cli2, 0x10000, 0, fid_persistent,
-                              fid_volatile, 2, 0,
-                              talloc_tos(), &result, &nread);
-       if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED)) {
+       status = smb2cli_read(cli2->conn, cli2->timeout, cli2->smb2.session,
+                             cli2->smb2.tcon, 0x10000, 0, fid_persistent,
+                             fid_volatile, 2, 0,
+                             talloc_tos(), &result, &nread);
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED) &&
+           !NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_NAME_DELETED))
+       {
                printf("smb2cli_read returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = smb2cli_create(cli2, "session-reconnect.txt",
+       status = smb2cli_create(cli2->conn, cli2->timeout, cli2->smb2.session,
+                       cli2->smb2.tcon, "session-reconnect.txt",
                        SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
                        SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
                        SEC_STD_ALL | SEC_FILE_ALL, /* desired_access, */
@@ -598,7 +642,9 @@ bool run_smb2_session_reconnect(int dummy)
                        NULL, /* smb2_create_blobs *blobs */
                        &fid_persistent,
                        &fid_volatile);
-       if (!NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_NAME_DELETED)) {
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_NAME_DELETED) &&
+           !NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_NAME_DELETED))
+       {
                printf("smb2cli_create on cli2 %s\n", nt_errstr(status));
                return false;
        }
@@ -611,7 +657,8 @@ bool run_smb2_session_reconnect(int dummy)
                return false;
        }
 
-       status = smb2cli_create(cli2, "session-reconnect.txt",
+       status = smb2cli_create(cli2->conn, cli2->timeout, cli2->smb2.session,
+                       cli2->smb2.tcon, "session-reconnect.txt",
                        SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
                        SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
                        SEC_STD_ALL | SEC_FILE_ALL, /* desired_access, */
@@ -627,22 +674,25 @@ bool run_smb2_session_reconnect(int dummy)
                return false;
        }
 
-       status = smb2cli_write(cli2, strlen(hello), 0, fid_persistent,
+       status = smb2cli_write(cli2->conn, cli2->timeout, cli2->smb2.session,
+                              cli2->smb2.tcon, strlen(hello), 0, fid_persistent,
                               fid_volatile, 0, 0, (const uint8_t *)hello);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_write returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = smb2cli_flush(cli2, fid_persistent, fid_volatile);
+       status = smb2cli_flush(cli2->conn, cli2->timeout, cli2->smb2.session,
+                              cli2->smb2.tcon, fid_persistent, fid_volatile);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_flush returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = smb2cli_read(cli2, 0x10000, 0, fid_persistent,
-                              fid_volatile, 2, 0,
-                              talloc_tos(), &result, &nread);
+       status = smb2cli_read(cli2->conn, cli2->timeout, cli2->smb2.session,
+                             cli2->smb2.tcon, 0x10000, 0, fid_persistent,
+                             fid_volatile, 2, 0,
+                             talloc_tos(), &result, &nread);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_read returned %s\n", nt_errstr(status));
                return false;
@@ -671,6 +721,8 @@ bool run_smb2_tcon_dependence(int dummy)
        const char *hello = "Hello, world\n";
        uint8_t *result;
        uint32_t nread;
+       struct smbXcli_tcon *tcon2;
+       uint32_t tcon2_id;
 
        printf("Starting SMB2-TCON-DEPENDENCE\n");
 
@@ -701,7 +753,8 @@ bool run_smb2_tcon_dependence(int dummy)
                return false;
        }
 
-       status = smb2cli_create(cli, "tcon_depedence.txt",
+       status = smb2cli_create(cli->conn, cli->timeout, cli->smb2.session,
+                       cli->smb2.tcon, "tcon_depedence.txt",
                        SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
                        SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
                        SEC_STD_ALL | SEC_FILE_ALL, /* desired_access, */
@@ -717,22 +770,25 @@ bool run_smb2_tcon_dependence(int dummy)
                return false;
        }
 
-       status = smb2cli_write(cli, strlen(hello), 0, fid_persistent,
+       status = smb2cli_write(cli->conn, cli->timeout, cli->smb2.session,
+                              cli->smb2.tcon, strlen(hello), 0, fid_persistent,
                               fid_volatile, 0, 0, (const uint8_t *)hello);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_write returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = smb2cli_flush(cli, fid_persistent, fid_volatile);
+       status = smb2cli_flush(cli->conn, cli->timeout, cli->smb2.session,
+                              cli->smb2.tcon, fid_persistent, fid_volatile);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_flush returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = smb2cli_read(cli, 0x10000, 0, fid_persistent,
-                              fid_volatile, 2, 0,
-                              talloc_tos(), &result, &nread);
+       status = smb2cli_read(cli->conn, cli->timeout, cli->smb2.session,
+                             cli->smb2.tcon, 0x10000, 0, fid_persistent,
+                             fid_volatile, 2, 0,
+                             talloc_tos(), &result, &nread);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_read returned %s\n", nt_errstr(status));
                return false;
@@ -752,17 +808,26 @@ bool run_smb2_tcon_dependence(int dummy)
 
        /* check behaviour with wrong tid... */
 
-       cli->smb2.tid++;
-
-       status = smb2cli_read(cli, 0x10000, 0, fid_persistent,
-                              fid_volatile, 2, 0,
-                              talloc_tos(), &result, &nread);
+       tcon2 = smbXcli_tcon_create(cli);
+       tcon2_id = smb2cli_tcon_current_id(cli->smb2.tcon);
+       tcon2_id++;
+       smb2cli_tcon_set_values(tcon2,
+                               tcon2_id,
+                               0, /* type */
+                               0, /* flags */
+                               0, /* capabilities */
+                               0  /* maximal_access */);
+
+       status = smb2cli_read(cli->conn, cli->timeout, cli->smb2.session,
+                             tcon2, 0x10000, 0, fid_persistent,
+                             fid_volatile, 2, 0,
+                             talloc_tos(), &result, &nread);
        if (!NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_NAME_DELETED)) {
                printf("smb2cli_read returned %s\n", nt_errstr(status));
                return false;
        }
 
-       cli->smb2.tid--;
+       talloc_free(tcon2);
 
        return true;
 }
@@ -974,7 +1039,7 @@ bool run_smb2_multi_channel(int dummy)
        cli2->smb2.tid = cli1->smb2.tid;
 
        status = smb2cli_session_create_channel(cli3,
-                                               cli2->smb2.session,
+                                               cli1->smb2.session,
                                                cli3->conn,
                                                &cli3->smb2.session);
        if (!NT_STATUS_IS_OK(status)) {
@@ -1101,7 +1166,8 @@ bool run_smb2_multi_channel(int dummy)
 
        cli3->smb2.tid = cli2->smb2.tid;
 
-       status = smb2cli_create(cli2, "multi-channel.txt",
+       status = smb2cli_create(cli2->conn, cli2->timeout, cli2->smb2.session,
+                       cli2->smb2.tcon, "multi-channel.txt",
                        SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
                        SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
                        SEC_STD_ALL | SEC_FILE_ALL, /* desired_access, */
@@ -1117,34 +1183,39 @@ bool run_smb2_multi_channel(int dummy)
                return false;
        }
 
-       status = smb2cli_write(cli1, strlen(hello), 0, fid_persistent,
+       status = smb2cli_write(cli1->conn, cli1->timeout, cli1->smb2.session,
+                              cli1->smb2.tcon, strlen(hello), 0, fid_persistent,
                               fid_volatile, 0, 0, (const uint8_t *)hello);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_write returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = smb2cli_flush(cli2, fid_persistent, fid_volatile);
+       status = smb2cli_flush(cli2->conn, cli2->timeout, cli2->smb2.session,
+                              cli2->smb2.tcon, fid_persistent, fid_volatile);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_flush returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = smb2cli_flush(cli1, fid_persistent, fid_volatile);
+       status = smb2cli_flush(cli1->conn, cli1->timeout, cli1->smb2.session,
+                              cli1->smb2.tcon, fid_persistent, fid_volatile);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_flush returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = smb2cli_flush(cli3, fid_persistent, fid_volatile);
+       status = smb2cli_flush(cli3->conn, cli3->timeout, cli3->smb2.session,
+                              cli3->smb2.tcon, fid_persistent, fid_volatile);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_flush returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = smb2cli_read(cli2, 0x10000, 0, fid_persistent,
-                              fid_volatile, 2, 0,
-                              talloc_tos(), &result, &nread);
+       status = smb2cli_read(cli2->conn, cli2->timeout, cli2->smb2.session,
+                             cli2->smb2.tcon, 0x10000, 0, fid_persistent,
+                             fid_volatile, 2, 0,
+                             talloc_tos(), &result, &nread);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_read returned %s\n", nt_errstr(status));
                return false;
@@ -1234,25 +1305,29 @@ bool run_smb2_multi_channel(int dummy)
                return false;
        }
 
-       status = smb2cli_flush(cli1, fid_persistent, fid_volatile);
+       status = smb2cli_flush(cli1->conn, cli1->timeout, cli1->smb2.session,
+                              cli1->smb2.tcon, fid_persistent, fid_volatile);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_flush returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = smb2cli_flush(cli2, fid_persistent, fid_volatile);
+       status = smb2cli_flush(cli2->conn, cli2->timeout, cli2->smb2.session,
+                              cli2->smb2.tcon, fid_persistent, fid_volatile);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_flush returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = smb2cli_flush(cli3, fid_persistent, fid_volatile);
+       status = smb2cli_flush(cli3->conn, cli3->timeout, cli3->smb2.session,
+                              cli3->smb2.tcon, fid_persistent, fid_volatile);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_flush returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = smb2cli_create(cli1, "multi-channel-invalid.txt",
+       status = smb2cli_create(cli1->conn, cli1->timeout, cli1->smb2.session,
+                       cli1->smb2.tcon, "multi-channel-invalid.txt",
                        SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
                        SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
                        SEC_STD_ALL | SEC_FILE_ALL, /* desired_access, */
@@ -1268,7 +1343,8 @@ bool run_smb2_multi_channel(int dummy)
                return false;
        }
 
-       status = smb2cli_create(cli2, "multi-channel-invalid.txt",
+       status = smb2cli_create(cli2->conn, cli2->timeout, cli2->smb2.session,
+                       cli2->smb2.tcon, "multi-channel-invalid.txt",
                        SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
                        SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
                        SEC_STD_ALL | SEC_FILE_ALL, /* desired_access, */
@@ -1284,7 +1360,8 @@ bool run_smb2_multi_channel(int dummy)
                return false;
        }
 
-       status = smb2cli_create(cli3, "multi-channel-invalid.txt",
+       status = smb2cli_create(cli3->conn, cli3->timeout, cli3->smb2.session,
+                       cli3->smb2.tcon, "multi-channel-invalid.txt",
                        SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
                        SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
                        SEC_STD_ALL | SEC_FILE_ALL, /* desired_access, */
@@ -1328,25 +1405,29 @@ bool run_smb2_multi_channel(int dummy)
                return false;
        }
 
-       status = smb2cli_close(cli3, 0, fid_persistent, fid_volatile);
+       status = smb2cli_close(cli3->conn, cli3->timeout, cli3->smb2.session,
+                              cli3->smb2.tcon, 0, fid_persistent, fid_volatile);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_close returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = smb2cli_flush(cli3, fid_persistent, fid_volatile);
+       status = smb2cli_flush(cli3->conn, cli3->timeout, cli3->smb2.session,
+                              cli3->smb2.tcon, fid_persistent, fid_volatile);
        if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED)) {
                printf("smb2cli_flush returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = smb2cli_flush(cli2, fid_persistent, fid_volatile);
+       status = smb2cli_flush(cli2->conn, cli2->timeout, cli2->smb2.session,
+                              cli2->smb2.tcon, fid_persistent, fid_volatile);
        if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED)) {
                printf("smb2cli_flush returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = smb2cli_flush(cli1, fid_persistent, fid_volatile);
+       status = smb2cli_flush(cli1->conn, cli1->timeout, cli1->smb2.session,
+                              cli1->smb2.tcon, fid_persistent, fid_volatile);
        if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED)) {
                printf("smb2cli_flush returned %s\n", nt_errstr(status));
                return false;
@@ -1374,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");
 
@@ -1410,7 +1492,8 @@ bool run_smb2_session_reauth(int dummy)
                return false;
        }
 
-       status = smb2cli_create(cli, "session-reauth.txt",
+       status = smb2cli_create(cli->conn, cli->timeout, cli->smb2.session,
+                       cli->smb2.tcon, "session-reauth.txt",
                        SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
                        SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
                        SEC_STD_ALL | SEC_FILE_ALL, /* desired_access, */
@@ -1426,7 +1509,8 @@ bool run_smb2_session_reauth(int dummy)
                return false;
        }
 
-       status = smb2cli_create(cli, "",
+       status = smb2cli_create(cli->conn, cli->timeout, cli->smb2.session,
+                       cli->smb2.tcon, "",
                        SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
                        SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
                        SEC_STD_SYNCHRONIZE|
@@ -1445,7 +1529,8 @@ bool run_smb2_session_reauth(int dummy)
        }
 
        status = smb2cli_query_directory(
-               cli, 1, 0x3, 0, dir_persistent, dir_volatile,
+               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);
        if (!NT_STATUS_IS_OK(status)) {
@@ -1531,14 +1616,16 @@ bool run_smb2_session_reauth(int dummy)
                return false;
        }
 
-       status = smb2cli_flush(cli, fid_persistent, fid_volatile);
+       status = smb2cli_flush(cli->conn, cli->timeout, cli->smb2.session,
+                              cli->smb2.tcon, fid_persistent, fid_volatile);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_flush returned %s\n", nt_errstr(status));
                return false;
        }
 
        status = smb2cli_query_directory(
-               cli, 1, 0x3, 0, dir_persistent, dir_volatile,
+               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);
        if (!NT_STATUS_IS_OK(status)) {
@@ -1552,7 +1639,7 @@ bool run_smb2_session_reauth(int dummy)
        status = smb2cli_query_info(cli->conn,
                                    cli->timeout,
                                    cli->smb2.session,
-                                   cli->smb2.tid,
+                                   cli->smb2.tcon,
                                    SMB2_GETINFO_SECURITY,
                                    0, /* in_file_info_class */
                                    1024, /* in_max_output_length */
@@ -1572,7 +1659,7 @@ bool run_smb2_session_reauth(int dummy)
        status = smb2cli_query_info(cli->conn,
                                    cli->timeout,
                                    cli->smb2.session,
-                                   cli->smb2.tid,
+                                   cli->smb2.tcon,
                                    SMB2_GETINFO_FILE,
                                    in_file_info_class,
                                    1024, /* in_max_output_length */
@@ -1595,7 +1682,7 @@ bool run_smb2_session_reauth(int dummy)
        status = smb2cli_set_info(cli->conn,
                                  cli->timeout,
                                  cli->smb2.session,
-                                 cli->smb2.tid,
+                                 cli->smb2.tcon,
                                  SMB2_GETINFO_FILE,
                                  in_file_info_class,
                                  &in_input_buffer,
@@ -1607,7 +1694,8 @@ bool run_smb2_session_reauth(int dummy)
                return false;
        }
 
-       status = smb2cli_create(cli, "session-reauth-invalid.txt",
+       status = smb2cli_create(cli->conn, cli->timeout, cli->smb2.session,
+                       cli->smb2.tcon, "session-reauth-invalid.txt",
                        SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
                        SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
                        SEC_STD_ALL | SEC_FILE_ALL, /* desired_access, */
@@ -1623,7 +1711,8 @@ bool run_smb2_session_reauth(int dummy)
                return false;
        }
 
-       status = smb2cli_create(cli, "",
+       status = smb2cli_create(cli->conn, cli->timeout, cli->smb2.session,
+                       cli->smb2.tcon, "",
                        SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
                        SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
                        SEC_STD_SYNCHRONIZE|
@@ -1642,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,
@@ -1677,7 +1776,8 @@ bool run_smb2_session_reauth(int dummy)
                return false;
        }
 
-       status = smb2cli_flush(cli, fid_persistent, fid_volatile);
+       status = smb2cli_flush(cli->conn, cli->timeout, cli->smb2.session,
+                              cli->smb2.tcon, fid_persistent, fid_volatile);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_flush returned %s\n", nt_errstr(status));
                return false;
@@ -1686,7 +1786,7 @@ bool run_smb2_session_reauth(int dummy)
        status = smb2cli_query_info(cli->conn,
                                    cli->timeout,
                                    cli->smb2.session,
-                                   cli->smb2.tid,
+                                   cli->smb2.tcon,
                                    SMB2_GETINFO_SECURITY,
                                    0, /* in_file_info_class */
                                    1024, /* in_max_output_length */
@@ -1706,7 +1806,7 @@ bool run_smb2_session_reauth(int dummy)
        status = smb2cli_query_info(cli->conn,
                                    cli->timeout,
                                    cli->smb2.session,
-                                   cli->smb2.tid,
+                                   cli->smb2.tcon,
                                    SMB2_GETINFO_FILE,
                                    in_file_info_class,
                                    1024, /* in_max_output_length */
@@ -1729,7 +1829,7 @@ bool run_smb2_session_reauth(int dummy)
        status = smb2cli_set_info(cli->conn,
                                  cli->timeout,
                                  cli->smb2.session,
-                                 cli->smb2.tid,
+                                 cli->smb2.tcon,
                                  SMB2_GETINFO_FILE,
                                  in_file_info_class,
                                  &in_input_buffer,
@@ -1745,7 +1845,7 @@ bool run_smb2_session_reauth(int dummy)
        status = smb2cli_query_info(cli->conn,
                                    cli->timeout,
                                    cli->smb2.session,
-                                   cli->smb2.tid,
+                                   cli->smb2.tcon,
                                    SMB2_GETINFO_FILE,
                                    in_file_info_class,
                                    1024, /* in_max_output_length */
@@ -1761,13 +1861,15 @@ bool run_smb2_session_reauth(int dummy)
                return false;
        }
 
-       status = smb2cli_close(cli, 0, fid_persistent, fid_volatile);
+       status = smb2cli_close(cli->conn, cli->timeout, cli->smb2.session,
+                              cli->smb2.tcon, 0, fid_persistent, fid_volatile);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_close returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = smb2cli_create(cli, "session-reauth.txt",
+       status = smb2cli_create(cli->conn, cli->timeout, cli->smb2.session,
+                       cli->smb2.tcon, "session-reauth.txt",
                        SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
                        SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
                        SEC_STD_ALL | SEC_FILE_ALL, /* desired_access, */
@@ -1784,7 +1886,8 @@ bool run_smb2_session_reauth(int dummy)
        }
 
        status = smb2cli_query_directory(
-               cli, 1, 0x3, 0, dir_persistent, dir_volatile,
+               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);
        if (!NT_STATUS_IS_OK(status)) {
@@ -1792,24 +1895,36 @@ bool run_smb2_session_reauth(int dummy)
                return false;
        }
 
-       status = smb2cli_close(cli, 0, dir_persistent, dir_volatile);
+       status = smb2cli_close(cli->conn, cli->timeout, cli->smb2.session,
+                              cli->smb2.tcon, 0, dir_persistent, dir_volatile);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_close returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = smb2cli_close(cli, 0, fid_persistent, fid_volatile);
+       status = smb2cli_close(cli->conn, cli->timeout, cli->smb2.session,
+                              cli->smb2.tcon, 0, fid_persistent, fid_volatile);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_close returned %s\n", nt_errstr(status));
                return false;
        }
 
        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;