s3:torture:smb2: pass smb2-session-reconnect test (add generosity in error case)
[ddiss/samba.git] / source3 / torture / test_smb2.c
index 017bc926446d88df7b7090b5181de48fe4f43f5f..af0e1561d9ad329d03d227a2a1f9bd10d31c811b 100644 (file)
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "torture/proto.h"
 #include "client.h"
+#include "trans2.h"
 #include "../libcli/smb/smbXcli_base.h"
 #include "libsmb/smb2cli.h"
 #include "libcli/security/security.h"
@@ -71,7 +72,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.tid, "smb2-basic.txt",
                        SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
                        SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
                        SEC_STD_ALL | SEC_FILE_ALL, /* desired_access, */
@@ -87,22 +89,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.tid, 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.tid, 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.tid, 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;
@@ -120,13 +125,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.tid, 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.tid, "",
                        SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
                        SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
                        SEC_STD_SYNCHRONIZE|
@@ -145,7 +152,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.tid,
+               1, 0, 0, fid_persistent, fid_volatile, "*", 0xffff,
                talloc_tos(), &dir_data, &dir_data_length);
 
        if (!NT_STATUS_IS_OK(status)) {
@@ -153,7 +161,8 @@ 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.tid, 0, fid_persistent, fid_volatile);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_close returned %s\n", nt_errstr(status));
                return false;
@@ -174,7 +183,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;
@@ -188,7 +197,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;
@@ -212,7 +221,7 @@ bool run_smb2_negprot(int dummy)
        cli->smb2.pid = 0xFEFF;
 
        status = smbXcli_negprot(cli->conn, cli->timeout,
-                                PROTOCOL_CORE, PROTOCOL_SMB2_24);
+                                PROTOCOL_CORE, PROTOCOL_LATEST);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smbXcli_negprot returned %s\n", nt_errstr(status));
                return false;
@@ -233,6 +242,9 @@ bool run_smb2_negprot(int dummy)
        case PROTOCOL_SMB2_24:
                name = "SMB2_24";
                break;
+       case PROTOCOL_SMB3_00:
+               name = "SMB3_00";
+               break;
        default:
                break;
        }
@@ -289,7 +301,7 @@ bool run_smb2_session_reconnect(int dummy)
        cli1->smb2.pid = 0xFEFF;
 
        status = smbXcli_negprot(cli1->conn, cli1->timeout,
-                                PROTOCOL_SMB2_02, PROTOCOL_SMB2_24);
+                                PROTOCOL_SMB2_02, PROTOCOL_LATEST);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smbXcli_negprot returned %s\n", nt_errstr(status));
                return false;
@@ -310,7 +322,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.tid, "session-reconnect.txt",
                        SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
                        SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
                        SEC_STD_ALL | SEC_FILE_ALL, /* desired_access, */
@@ -326,22 +339,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.tid, 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.tid, 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.tid, 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;
@@ -367,7 +383,7 @@ bool run_smb2_session_reconnect(int dummy)
        cli2->smb2.pid = 0xFEFF;
 
        status = smbXcli_negprot(cli2->conn, cli2->timeout,
-                                PROTOCOL_SMB2_02, PROTOCOL_SMB2_24);
+                                PROTOCOL_SMB2_02, PROTOCOL_LATEST);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smbXcli_negprot returned %s\n", nt_errstr(status));
                return false;
@@ -493,7 +509,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.tid, 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;
@@ -510,28 +527,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.tid, 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.tid, 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.tid, 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.tid, "session-reconnect.txt",
                        SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
                        SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
                        SEC_STD_ALL | SEC_FILE_ALL, /* desired_access, */
@@ -562,28 +589,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.tid, 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.tid, 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.tid, 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.tid, "session-reconnect.txt",
                        SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
                        SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
                        SEC_STD_ALL | SEC_FILE_ALL, /* desired_access, */
@@ -594,7 +631,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;
        }
@@ -607,7 +646,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.tid, "session-reconnect.txt",
                        SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
                        SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
                        SEC_STD_ALL | SEC_FILE_ALL, /* desired_access, */
@@ -623,22 +663,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.tid, 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.tid, 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.tid, 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;
@@ -676,7 +719,7 @@ bool run_smb2_tcon_dependence(int dummy)
        cli->smb2.pid = 0xFEFF;
 
        status = smbXcli_negprot(cli->conn, cli->timeout,
-                                PROTOCOL_SMB2_02, PROTOCOL_SMB2_24);
+                                PROTOCOL_SMB2_02, PROTOCOL_LATEST);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smbXcli_negprot returned %s\n", nt_errstr(status));
                return false;
@@ -697,7 +740,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.tid, "tcon_depedence.txt",
                        SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
                        SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
                        SEC_STD_ALL | SEC_FILE_ALL, /* desired_access, */
@@ -713,22 +757,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.tid, 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.tid, 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.tid, 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;
@@ -750,9 +797,10 @@ bool run_smb2_tcon_dependence(int dummy)
 
        cli->smb2.tid++;
 
-       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.tid, 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;
@@ -800,21 +848,21 @@ bool run_smb2_multi_channel(int dummy)
        cli3->smb2.pid = 0xFEFF;
 
        status = smbXcli_negprot(cli1->conn, cli1->timeout,
-                                PROTOCOL_SMB2_22, PROTOCOL_SMB2_24);
+                                PROTOCOL_SMB2_22, PROTOCOL_LATEST);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smbXcli_negprot returned %s\n", nt_errstr(status));
                return false;
        }
 
        status = smbXcli_negprot(cli2->conn, cli2->timeout,
-                                PROTOCOL_SMB2_22, PROTOCOL_SMB2_24);
+                                PROTOCOL_SMB2_22, PROTOCOL_LATEST);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smbXcli_negprot returned %s\n", nt_errstr(status));
                return false;
        }
 
        status = smbXcli_negprot(cli3->conn, cli3->timeout,
-                                PROTOCOL_SMB2_22, PROTOCOL_SMB2_24);
+                                PROTOCOL_SMB2_22, PROTOCOL_LATEST);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smbXcli_negprot returned %s\n", nt_errstr(status));
                return false;
@@ -1097,7 +1145,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.tid, "multi-channel.txt",
                        SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
                        SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
                        SEC_STD_ALL | SEC_FILE_ALL, /* desired_access, */
@@ -1113,34 +1162,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.tid, 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.tid, 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.tid, 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.tid, 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.tid, 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;
@@ -1158,25 +1212,201 @@ bool run_smb2_multi_channel(int dummy)
                return false;
        }
 
-       status = smb2cli_close(cli3, 0, fid_persistent, fid_volatile);
+       status = auth_generic_client_prepare(talloc_tos(), &auth_generic_state);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("auth_generic_client_prepare returned %s\n", nt_errstr(status));
+               return false;
+       }
+
+       gensec_want_feature(auth_generic_state->gensec_security,
+                           GENSEC_FEATURE_SESSION_KEY);
+       status = auth_generic_set_username(auth_generic_state, username);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("auth_generic_set_username returned %s\n", nt_errstr(status));
+               return false;
+       }
+
+       status = auth_generic_set_domain(auth_generic_state, workgroup);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("auth_generic_set_domain returned %s\n", nt_errstr(status));
+               return false;
+       }
+
+       status = auth_generic_set_password(auth_generic_state, password);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("auth_generic_set_password returned %s\n", nt_errstr(status));
+               return false;
+       }
+
+       status = auth_generic_client_start(auth_generic_state, GENSEC_OID_NTLMSSP);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("auth_generic_client_start returned %s\n", nt_errstr(status));
+               return false;
+       }
+
+       status = gensec_update(auth_generic_state->gensec_security, talloc_tos(), ev, data_blob_null, &in_blob);
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
+               printf("gensec_update returned %s\n", nt_errstr(status));
+               return false;
+       }
+
+       subreq = smb2cli_session_setup_send(talloc_tos(), ev,
+                                           cli3->conn,
+                                           cli3->timeout,
+                                           cli3->smb2.session,
+                                           0x0, /* in_flags */
+                                           SMB2_CAP_DFS, /* in_capabilities */
+                                           0, /* in_channel */
+                                           0, /* in_previous_session_id */
+                                           &in_blob); /* in_security_buffer */
+       if (subreq == NULL) {
+               printf("smb2cli_session_setup_send() returned NULL\n");
+               return false;
+       }
+
+       ok = tevent_req_poll(subreq, ev);
+       if (!ok) {
+               printf("tevent_req_poll() returned false\n");
+               return false;
+       }
+
+       status = smb2cli_session_setup_recv(subreq, talloc_tos(),
+                                           NULL, &out_blob);
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
+               printf("smb2cli_session_setup_recv returned %s\n",
+                       nt_errstr(status));
+               return false;
+       }
+
+       status = gensec_update(auth_generic_state->gensec_security, talloc_tos(), ev, out_blob, &in_blob);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("auth_generic_update returned %s\n", nt_errstr(status));
+               return false;
+       }
+
+       status = smb2cli_flush(cli1->conn, cli1->timeout, cli1->smb2.session,
+                              cli1->smb2.tid, 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->conn, cli2->timeout, cli2->smb2.session,
+                              cli2->smb2.tid, 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->conn, cli3->timeout, cli3->smb2.session,
+                              cli3->smb2.tid, 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->conn, cli1->timeout, cli1->smb2.session,
+                       cli1->smb2.tid, "multi-channel-invalid.txt",
+                       SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
+                       SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
+                       SEC_STD_ALL | SEC_FILE_ALL, /* desired_access, */
+                       FILE_ATTRIBUTE_NORMAL, /* file_attributes, */
+                       FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, /* share_access, */
+                       FILE_CREATE, /* create_disposition, */
+                       FILE_DELETE_ON_CLOSE, /* create_options, */
+                       NULL, /* smb2_create_blobs *blobs */
+                       &fid_persistent,
+                       &fid_volatile);
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_HANDLE)) {
+               printf("smb2cli_create %s\n", nt_errstr(status));
+               return false;
+       }
+
+       status = smb2cli_create(cli2->conn, cli2->timeout, cli2->smb2.session,
+                       cli2->smb2.tid, "multi-channel-invalid.txt",
+                       SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
+                       SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
+                       SEC_STD_ALL | SEC_FILE_ALL, /* desired_access, */
+                       FILE_ATTRIBUTE_NORMAL, /* file_attributes, */
+                       FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, /* share_access, */
+                       FILE_CREATE, /* create_disposition, */
+                       FILE_DELETE_ON_CLOSE, /* create_options, */
+                       NULL, /* smb2_create_blobs *blobs */
+                       &fid_persistent,
+                       &fid_volatile);
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_HANDLE)) {
+               printf("smb2cli_create %s\n", nt_errstr(status));
+               return false;
+       }
+
+       status = smb2cli_create(cli3->conn, cli3->timeout, cli3->smb2.session,
+                       cli3->smb2.tid, "multi-channel-invalid.txt",
+                       SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
+                       SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
+                       SEC_STD_ALL | SEC_FILE_ALL, /* desired_access, */
+                       FILE_ATTRIBUTE_NORMAL, /* file_attributes, */
+                       FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, /* share_access, */
+                       FILE_CREATE, /* create_disposition, */
+                       FILE_DELETE_ON_CLOSE, /* create_options, */
+                       NULL, /* smb2_create_blobs *blobs */
+                       &fid_persistent,
+                       &fid_volatile);
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_HANDLE)) {
+               printf("smb2cli_create %s\n", nt_errstr(status));
+               return false;
+       }
+
+       subreq = smb2cli_session_setup_send(talloc_tos(), ev,
+                                           cli2->conn,
+                                           cli2->timeout,
+                                           cli2->smb2.session,
+                                           0x0, /* in_flags */
+                                           SMB2_CAP_DFS, /* in_capabilities */
+                                           0, /* in_channel */
+                                           0, /* in_previous_session_id */
+                                           &in_blob); /* in_security_buffer */
+       if (subreq == NULL) {
+               printf("smb2cli_session_setup_send() returned NULL\n");
+               return false;
+       }
+
+       ok = tevent_req_poll(subreq, ev);
+       if (!ok) {
+               printf("tevent_req_poll() returned false\n");
+               return false;
+       }
+
+       status = smb2cli_session_setup_recv(subreq, talloc_tos(),
+                                           &recv_iov, &out_blob);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("smb2cli_session_setup_recv returned %s\n",
+                       nt_errstr(status));
+               return false;
+       }
+
+       status = smb2cli_close(cli3->conn, cli3->timeout, cli3->smb2.session,
+                              cli3->smb2.tid, 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.tid, 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.tid, 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.tid, fid_persistent, fid_volatile);
        if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED)) {
                printf("smb2cli_flush returned %s\n", nt_errstr(status));
                return false;
@@ -1198,6 +1428,9 @@ bool run_smb2_session_reauth(int dummy)
        struct tevent_req *subreq;
        DATA_BLOB in_blob = data_blob_null;
        DATA_BLOB out_blob;
+       DATA_BLOB in_input_buffer;
+       DATA_BLOB out_output_buffer;
+       uint8_t in_file_info_class;
        struct auth_generic_state *auth_generic_state;
        struct iovec *recv_iov;
        uint32_t saved_tid;
@@ -1237,7 +1470,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.tid, "session-reauth.txt",
                        SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
                        SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
                        SEC_STD_ALL | SEC_FILE_ALL, /* desired_access, */
@@ -1253,7 +1487,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.tid, "",
                        SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
                        SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
                        SEC_STD_SYNCHRONIZE|
@@ -1272,7 +1507,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.tid,
+               1, 0x3, 0, dir_persistent, dir_volatile,
                "session-reauth.txt", 0xffff,
                talloc_tos(), &dir_data, &dir_data_length);
        if (!NT_STATUS_IS_OK(status)) {
@@ -1358,14 +1594,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.tid, 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.tid,
+               1, 0x3, 0, dir_persistent, dir_volatile,
                "session-reauth.txt", 0xffff,
                talloc_tos(), &dir_data, &dir_data_length);
        if (!NT_STATUS_IS_OK(status)) {
@@ -1373,7 +1611,69 @@ bool run_smb2_session_reauth(int dummy)
                return false;
        }
 
-       status = smb2cli_create(cli, "session-reauth-invalid.txt",
+       /*
+        * query_info seems to be a path based operation on Windows...
+        */
+       status = smb2cli_query_info(cli->conn,
+                                   cli->timeout,
+                                   cli->smb2.session,
+                                   cli->smb2.tid,
+                                   SMB2_GETINFO_SECURITY,
+                                   0, /* in_file_info_class */
+                                   1024, /* in_max_output_length */
+                                   NULL, /* in_input_buffer */
+                                   SECINFO_OWNER, /* in_additional_info */
+                                   0, /* in_flags */
+                                   fid_persistent,
+                                   fid_volatile,
+                                   talloc_tos(),
+                                   &out_output_buffer);
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_HANDLE)) {
+               printf("smb2cli_query_info (security) returned %s\n", nt_errstr(status));
+               return false;
+       }
+
+       in_file_info_class = SMB_FILE_POSITION_INFORMATION - 1000;
+       status = smb2cli_query_info(cli->conn,
+                                   cli->timeout,
+                                   cli->smb2.session,
+                                   cli->smb2.tid,
+                                   SMB2_GETINFO_FILE,
+                                   in_file_info_class,
+                                   1024, /* in_max_output_length */
+                                   NULL, /* in_input_buffer */
+                                   0, /* in_additional_info */
+                                   0, /* in_flags */
+                                   fid_persistent,
+                                   fid_volatile,
+                                   talloc_tos(),
+                                   &out_output_buffer);
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_HANDLE)) {
+               printf("smb2cli_query_info (position) returned %s\n", nt_errstr(status));
+               return false;
+       }
+
+       in_input_buffer = data_blob_talloc(talloc_tos(), NULL, 8);
+       SBVAL(in_input_buffer.data, 0, 512);
+
+       in_file_info_class = SMB_FILE_POSITION_INFORMATION - 1000;
+       status = smb2cli_set_info(cli->conn,
+                                 cli->timeout,
+                                 cli->smb2.session,
+                                 cli->smb2.tid,
+                                 SMB2_GETINFO_FILE,
+                                 in_file_info_class,
+                                 &in_input_buffer,
+                                 0, /* in_additional_info */
+                                 fid_persistent,
+                                 fid_volatile);
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_HANDLE)) {
+               printf("smb2cli_set_info (position) returned %s\n", nt_errstr(status));
+               return false;
+       }
+
+       status = smb2cli_create(cli->conn, cli->timeout, cli->smb2.session,
+                       cli->smb2.tid, "session-reauth-invalid.txt",
                        SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
                        SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
                        SEC_STD_ALL | SEC_FILE_ALL, /* desired_access, */
@@ -1389,7 +1689,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.tid, "",
                        SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
                        SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
                        SEC_STD_SYNCHRONIZE|
@@ -1443,19 +1744,100 @@ 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.tid, fid_persistent, fid_volatile);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_flush returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = smb2cli_close(cli, 0, fid_persistent, fid_volatile);
+       status = smb2cli_query_info(cli->conn,
+                                   cli->timeout,
+                                   cli->smb2.session,
+                                   cli->smb2.tid,
+                                   SMB2_GETINFO_SECURITY,
+                                   0, /* in_file_info_class */
+                                   1024, /* in_max_output_length */
+                                   NULL, /* in_input_buffer */
+                                   SECINFO_OWNER, /* in_additional_info */
+                                   0, /* in_flags */
+                                   fid_persistent,
+                                   fid_volatile,
+                                   talloc_tos(),
+                                   &out_output_buffer);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("smb2cli_query_info (security) returned %s\n", nt_errstr(status));
+               return false;
+       }
+
+       in_file_info_class = SMB_FILE_POSITION_INFORMATION - 1000;
+       status = smb2cli_query_info(cli->conn,
+                                   cli->timeout,
+                                   cli->smb2.session,
+                                   cli->smb2.tid,
+                                   SMB2_GETINFO_FILE,
+                                   in_file_info_class,
+                                   1024, /* in_max_output_length */
+                                   NULL, /* in_input_buffer */
+                                   0, /* in_additional_info */
+                                   0, /* in_flags */
+                                   fid_persistent,
+                                   fid_volatile,
+                                   talloc_tos(),
+                                   &out_output_buffer);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("smb2cli_query_info (position) returned %s\n", nt_errstr(status));
+               return false;
+       }
+
+       in_input_buffer = data_blob_talloc(talloc_tos(), NULL, 8);
+       SBVAL(in_input_buffer.data, 0, 512);
+
+       in_file_info_class = SMB_FILE_POSITION_INFORMATION - 1000;
+       status = smb2cli_set_info(cli->conn,
+                                 cli->timeout,
+                                 cli->smb2.session,
+                                 cli->smb2.tid,
+                                 SMB2_GETINFO_FILE,
+                                 in_file_info_class,
+                                 &in_input_buffer,
+                                 0, /* in_additional_info */
+                                 fid_persistent,
+                                 fid_volatile);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("smb2cli_set_info (position) returned %s\n", nt_errstr(status));
+               return false;
+       }
+
+       in_file_info_class = SMB_FILE_POSITION_INFORMATION - 1000;
+       status = smb2cli_query_info(cli->conn,
+                                   cli->timeout,
+                                   cli->smb2.session,
+                                   cli->smb2.tid,
+                                   SMB2_GETINFO_FILE,
+                                   in_file_info_class,
+                                   1024, /* in_max_output_length */
+                                   NULL, /* in_input_buffer */
+                                   0, /* in_additional_info */
+                                   0, /* in_flags */
+                                   fid_persistent,
+                                   fid_volatile,
+                                   talloc_tos(),
+                                   &out_output_buffer);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("smb2cli_query_info (position) returned %s\n", nt_errstr(status));
+               return false;
+       }
+
+       status = smb2cli_close(cli->conn, cli->timeout, cli->smb2.session,
+                              cli->smb2.tid, 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.tid, "session-reauth.txt",
                        SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
                        SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
                        SEC_STD_ALL | SEC_FILE_ALL, /* desired_access, */
@@ -1472,7 +1854,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.tid,
+               1, 0x3, 0, dir_persistent, dir_volatile,
                "session-reauth.txt", 0xffff,
                talloc_tos(), &dir_data, &dir_data_length);
        if (!NT_STATUS_IS_OK(status)) {
@@ -1480,13 +1863,15 @@ 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.tid, 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.tid, 0, fid_persistent, fid_volatile);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_close returned %s\n", nt_errstr(status));
                return false;