vfs_catia: Fix return value in lock functions
[bbaumbach/samba-autobuild/.git] / source3 / torture / test_smb2.c
index 017bc926446d88df7b7090b5181de48fe4f43f5f..0cfb68cbbef3836c73feccebafcc8b951372770c 100644 (file)
 #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"
 #include "libsmb/proto.h"
+#include "auth/credentials/credentials.h"
 #include "auth/gensec/gensec.h"
 #include "auth_generic.h"
+#include "../librpc/ndr/libndr.h"
+#include "libsmb/clirap.h"
 
 extern fstring host, workgroup, share, password, username, myname;
+extern struct cli_credentials *torture_creds;
 
 bool run_smb2_basic(int dummy)
 {
@@ -40,6 +44,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");
@@ -47,7 +52,6 @@ bool run_smb2_basic(int dummy)
        if (!torture_init_connection(&cli)) {
                return false;
        }
-       cli->smb2.pid = 0xFEFF;
 
        status = smbXcli_negprot(cli->conn, cli->timeout,
                                 PROTOCOL_SMB2_02, PROTOCOL_SMB2_02);
@@ -56,22 +60,20 @@ bool run_smb2_basic(int dummy)
                return false;
        }
 
-       status = cli_session_setup(cli, username,
-                                  password, strlen(password),
-                                  password, strlen(password),
-                                  workgroup);
+       status = cli_session_setup_creds(cli, torture_creds);
        if (!NT_STATUS_IS_OK(status)) {
                printf("cli_session_setup returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = cli_tree_connect(cli, share, "?????", "", 0);
+       status = cli_tree_connect(cli, share, "?????", NULL);
        if (!NT_STATUS_IS_OK(status)) {
                printf("cli_tree_connect returned %s\n", nt_errstr(status));
                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, */
@@ -81,28 +83,32 @@ bool run_smb2_basic(int dummy)
                        FILE_DELETE_ON_CLOSE, /* create_options, */
                        NULL, /* smb2_create_blobs *blobs */
                        &fid_persistent,
-                       &fid_volatile);
+                       &fid_volatile,
+                       NULL, NULL, NULL);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_create returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = smb2cli_write(cli, strlen(hello), 0, fid_persistent,
-                              fid_volatile, 0, 0, (const uint8_t *)hello);
+       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, NULL);
        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;
@@ -120,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|
@@ -138,14 +146,16 @@ bool run_smb2_basic(int dummy)
                        FILE_SYNCHRONOUS_IO_NONALERT|FILE_DIRECTORY_FILE, /* create_options, */
                        NULL, /* smb2_create_blobs *blobs */
                        &fid_persistent,
-                       &fid_volatile);
+                       &fid_volatile,
+                       NULL, NULL, NULL);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_create returned %s\n", nt_errstr(status));
                return false;
        }
 
        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)) {
@@ -153,28 +163,47 @@ 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;
-       status = smb2cli_tdis(cli);
+       saved_tid = smb2cli_tcon_current_id(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 */
+                               saved_tid,
+                               0, /* type */
+                               0, /* flags */
+                               0, /* capabilities */
+                               0  /* maximal_access */);
+       status = smb2cli_tdis(cli->conn,
+                             cli->timeout,
+                             cli->smb2.session,
+                             cli->smb2.tcon);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_tdis returned %s\n", nt_errstr(status));
                return false;
        }
-       cli->smb2.tid = saved_tid;
+       cli_state_restore_tcon(cli, saved_tcon);
 
-       status = smb2cli_tdis(cli);
+       status = smb2cli_tdis(cli->conn,
+                             cli->timeout,
+                             cli->smb2.session,
+                             cli->smb2.tcon);
        if (!NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_NAME_DELETED)) {
                printf("2nd smb2cli_tdis returned %s\n", nt_errstr(status));
                return false;
        }
 
        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 +217,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;
@@ -209,38 +238,21 @@ bool run_smb2_negprot(int dummy)
        if (!torture_init_connection(&cli)) {
                return false;
        }
-       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;
        }
 
        protocol = smbXcli_conn_protocol(cli->conn);
+       name = smb_protocol_types_string(protocol);
 
-       switch (protocol) {
-       case PROTOCOL_SMB2_02:
-               name = "SMB2_02";
-               break;
-       case PROTOCOL_SMB2_10:
-               name = "SMB2_10";
-               break;
-       case PROTOCOL_SMB2_22:
-               name = "SMB2_22";
-               break;
-       case PROTOCOL_SMB2_24:
-               name = "SMB2_24";
-               break;
-       default:
-               break;
-       }
-
-       if (name) {
+       if (protocol >= PROTOCOL_SMB2_02) {
                printf("Server supports %s\n", name);
        } else {
-               printf("Server DOES NOT support SMB2\n");
+               printf("Server DOES NOT support SMB2, only %s\n", name);
                return false;
        }
 
@@ -263,6 +275,47 @@ bool run_smb2_negprot(int dummy)
        return true;
 }
 
+bool run_smb2_anonymous(int dummy)
+{
+       struct cli_state *cli = NULL;
+       NTSTATUS status;
+       struct cli_credentials *anon_creds = NULL;
+       bool guest = false;
+
+       printf("Starting SMB2-ANONYMOUS\n");
+
+       if (!torture_init_connection(&cli)) {
+               return false;
+       }
+
+       status = smbXcli_negprot(cli->conn, cli->timeout,
+                                PROTOCOL_SMB2_02, PROTOCOL_LATEST);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("smbXcli_negprot returned %s\n", nt_errstr(status));
+               return false;
+       }
+
+       anon_creds = cli_credentials_init_anon(talloc_tos());
+       if (anon_creds == NULL) {
+               printf("cli_credentials_init_anon failed\n");
+               return false;
+       }
+
+       status = cli_session_setup_creds(cli, anon_creds);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("cli_session_setup returned %s\n", nt_errstr(status));
+               return false;
+       }
+
+       guest = smbXcli_session_is_guest(cli->smb2.session);
+       if (guest) {
+               printf("anonymous session should not have guest authentication\n");
+               return false;
+       }
+
+       return true;
+}
+
 bool run_smb2_session_reconnect(int dummy)
 {
        struct cli_state *cli1;
@@ -286,31 +339,28 @@ bool run_smb2_session_reconnect(int dummy)
        if (!torture_init_connection(&cli1)) {
                return false;
        }
-       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;
        }
 
-       status = cli_session_setup(cli1, username,
-                                  password, strlen(password),
-                                  password, strlen(password),
-                                  workgroup);
+       status = cli_session_setup_creds(cli1, torture_creds);
        if (!NT_STATUS_IS_OK(status)) {
                printf("cli_session_setup returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = cli_tree_connect(cli1, share, "?????", "", 0);
+       status = cli_tree_connect(cli1, share, "?????", NULL);
        if (!NT_STATUS_IS_OK(status)) {
                printf("cli_tree_connect returned %s\n", nt_errstr(status));
                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, */
@@ -320,28 +370,32 @@ bool run_smb2_session_reconnect(int dummy)
                        FILE_DELETE_ON_CLOSE, /* create_options, */
                        NULL, /* smb2_create_blobs *blobs */
                        &fid_persistent,
-                       &fid_volatile);
+                       &fid_volatile,
+                       NULL, NULL, NULL);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_create on cli1 %s\n", nt_errstr(status));
                return false;
        }
 
-       status = smb2cli_write(cli1, strlen(hello), 0, fid_persistent,
-                              fid_volatile, 0, 0, (const uint8_t *)hello);
+       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, NULL);
        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;
@@ -364,10 +418,9 @@ bool run_smb2_session_reconnect(int dummy)
        if (!torture_init_connection(&cli2)) {
                return false;
        }
-       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;
@@ -381,21 +434,10 @@ bool run_smb2_session_reconnect(int dummy)
 
        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);
+       status = auth_generic_set_creds(auth_generic_state, torture_creds);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("auth_generic_set_password returned %s\n", nt_errstr(status));
+               printf("auth_generic_set_creds returned %s\n", nt_errstr(status));
                return false;
        }
 
@@ -405,13 +447,14 @@ bool run_smb2_session_reconnect(int dummy)
                return false;
        }
 
-       ev = event_context_init(talloc_tos());
+       ev = samba_tevent_context_init(talloc_tos());
        if (ev == NULL) {
-               printf("event_context_init() returned NULL\n");
+               printf("samba_tevent_context_init() returned NULL\n");
                return false;
        }
 
-       status = gensec_update(auth_generic_state->gensec_security, talloc_tos(), ev, data_blob_null, &in_blob);
+       status = gensec_update(auth_generic_state->gensec_security,
+                              talloc_tos(), 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;
@@ -448,7 +491,8 @@ bool run_smb2_session_reconnect(int dummy)
                return false;
        }
 
-       status = gensec_update(auth_generic_state->gensec_security, talloc_tos(), ev, out_blob, &in_blob);
+       status = gensec_update(auth_generic_state->gensec_security,
+                              talloc_tos(), out_blob, &in_blob);
        if (!NT_STATUS_IS_OK(status)) {
                printf("auth_generic_update returned %s\n", nt_errstr(status));
                return false;
@@ -493,13 +537,14 @@ 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;
        }
 
-       status = cli_tree_connect(cli1, share, "?????", "", 0);
+       status = cli_tree_connect(cli1, share, "?????", NULL);
        if (!NT_STATUS_EQUAL(status, NT_STATUS_USER_SESSION_DELETED)) {
                printf("cli_tree_connect returned %s\n", nt_errstr(status));
                return false;
@@ -510,28 +555,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,
-                              fid_volatile, 0, 0, (const uint8_t *)hello);
-       if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED)) {
+       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, NULL);
+       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, */
@@ -541,7 +596,8 @@ bool run_smb2_session_reconnect(int dummy)
                        FILE_DELETE_ON_CLOSE, /* create_options, */
                        NULL, /* smb2_create_blobs *blobs */
                        &fid_persistent,
-                       &fid_volatile);
+                       &fid_volatile,
+                       NULL, NULL, NULL);
        if (!NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED) &&
            !NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_NAME_DELETED)) {
                printf("smb2cli_create on cli2 %s\n", nt_errstr(status));
@@ -560,30 +616,38 @@ bool run_smb2_session_reconnect(int dummy)
 
        /* the tid seems to be irrelevant at this stage */
 
-       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,
+                              cli1->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,
-                              fid_volatile, 0, 0, (const uint8_t *)hello);
-       if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED)) {
+       status = smb2cli_write(cli2->conn, cli2->timeout, cli2->smb2.session,
+                              cli1->smb2.tcon, strlen(hello), 0, fid_persistent,
+                              fid_volatile, 0, 0, (const uint8_t *)hello, NULL);
+       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,
+                             cli1->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,
+                       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, */
@@ -593,21 +657,25 @@ bool run_smb2_session_reconnect(int dummy)
                        FILE_DELETE_ON_CLOSE, /* create_options, */
                        NULL, /* smb2_create_blobs *blobs */
                        &fid_persistent,
-                       &fid_volatile);
-       if (!NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_NAME_DELETED)) {
+                       &fid_volatile,
+                       NULL, NULL, NULL);
+       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;
        }
 
        /* now do a new tcon and test file calls again */
 
-       status = cli_tree_connect(cli2, share, "?????", "", 0);
+       status = cli_tree_connect(cli2, share, "?????", NULL);
        if (!NT_STATUS_IS_OK(status)) {
                printf("cli_tree_connect 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, */
@@ -617,28 +685,32 @@ bool run_smb2_session_reconnect(int dummy)
                        FILE_DELETE_ON_CLOSE, /* create_options, */
                        NULL, /* smb2_create_blobs *blobs */
                        &fid_persistent,
-                       &fid_volatile);
+                       &fid_volatile,
+                       NULL, NULL, NULL);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_create on cli2 %s\n", nt_errstr(status));
                return false;
        }
 
-       status = smb2cli_write(cli2, strlen(hello), 0, fid_persistent,
-                              fid_volatile, 0, 0, (const uint8_t *)hello);
+       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, NULL);
        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;
@@ -667,37 +739,36 @@ 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");
 
        if (!torture_init_connection(&cli)) {
                return false;
        }
-       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;
        }
 
-       status = cli_session_setup(cli, username,
-                                  password, strlen(password),
-                                  password, strlen(password),
-                                  workgroup);
+       status = cli_session_setup_creds(cli, torture_creds);
        if (!NT_STATUS_IS_OK(status)) {
                printf("cli_session_setup returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = cli_tree_connect(cli, share, "?????", "", 0);
+       status = cli_tree_connect(cli, share, "?????", NULL);
        if (!NT_STATUS_IS_OK(status)) {
                printf("cli_tree_connect returned %s\n", nt_errstr(status));
                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, */
@@ -707,28 +778,32 @@ bool run_smb2_tcon_dependence(int dummy)
                        FILE_DELETE_ON_CLOSE, /* create_options, */
                        NULL, /* smb2_create_blobs *blobs */
                        &fid_persistent,
-                       &fid_volatile);
+                       &fid_volatile,
+                       NULL, NULL, NULL);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_create on cli %s\n", nt_errstr(status));
                return false;
        }
 
-       status = smb2cli_write(cli, strlen(hello), 0, fid_persistent,
-                              fid_volatile, 0, 0, (const uint8_t *)hello);
+       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, NULL);
        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;
@@ -748,17 +823,27 @@ 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,
+                               NULL, /* session */
+                               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;
 }
@@ -781,55 +866,54 @@ bool run_smb2_multi_channel(int dummy)
        const char *hello = "Hello, world\n";
        uint8_t *result;
        uint32_t nread;
+       struct GUID saved_guid = cli_state_client_guid;
 
        printf("Starting SMB2-MULTI-CHANNEL\n");
 
+       cli_state_client_guid = GUID_random();
+
        if (!torture_init_connection(&cli1)) {
                return false;
        }
-       cli1->smb2.pid = 0xFEFF;
 
        if (!torture_init_connection(&cli2)) {
                return false;
        }
-       cli2->smb2.pid = 0xFEFF;
 
        if (!torture_init_connection(&cli3)) {
                return false;
        }
-       cli3->smb2.pid = 0xFEFF;
+
+       cli_state_client_guid = saved_guid;
 
        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;
        }
 
-       status = cli_session_setup(cli1, username,
-                                  password, strlen(password),
-                                  password, strlen(password),
-                                  workgroup);
+       status = cli_session_setup_creds(cli1, torture_creds);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_sesssetup returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = cli_tree_connect(cli1, share, "?????", "", 0);
+       status = cli_tree_connect(cli1, share, "?????", NULL);
        if (!NT_STATUS_IS_OK(status)) {
                printf("cli_tree_connect returned %s\n", nt_errstr(status));
                return false;
@@ -853,21 +937,10 @@ bool run_smb2_multi_channel(int dummy)
 
        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);
+       status = auth_generic_set_creds(auth_generic_state, torture_creds);
        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));
+               printf("auth_generic_set_creds returned %s\n", nt_errstr(status));
                return false;
        }
 
@@ -877,13 +950,14 @@ bool run_smb2_multi_channel(int dummy)
                return false;
        }
 
-       ev = event_context_init(talloc_tos());
+       ev = samba_tevent_context_init(talloc_tos());
        if (ev == NULL) {
-               printf("event_context_init() returned NULL\n");
+               printf("samba_tevent_context_init() returned NULL\n");
                return false;
        }
 
-       status = gensec_update(auth_generic_state->gensec_security, talloc_tos(), ev, data_blob_null, &in_blob);
+       status = gensec_update(auth_generic_state->gensec_security,
+                              talloc_tos(), 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;
@@ -917,7 +991,8 @@ bool run_smb2_multi_channel(int dummy)
                return false;
        }
 
-       status = gensec_update(auth_generic_state->gensec_security, talloc_tos(), ev, out_blob, &in_blob);
+       status = gensec_update(auth_generic_state->gensec_security,
+                              talloc_tos(), out_blob, &in_blob);
        if (!NT_STATUS_IS_OK(status)) {
                printf("auth_generic_update returned %s\n", nt_errstr(status));
                return false;
@@ -967,10 +1042,8 @@ bool run_smb2_multi_channel(int dummy)
                return false;
        }
 
-       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)) {
@@ -987,21 +1060,10 @@ bool run_smb2_multi_channel(int dummy)
 
        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);
+       status = auth_generic_set_creds(auth_generic_state, torture_creds);
        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));
+               printf("auth_generic_set_creds returned %s\n", nt_errstr(status));
                return false;
        }
 
@@ -1011,7 +1073,8 @@ bool run_smb2_multi_channel(int dummy)
                return false;
        }
 
-       status = gensec_update(auth_generic_state->gensec_security, talloc_tos(), ev, data_blob_null, &in_blob);
+       status = gensec_update(auth_generic_state->gensec_security,
+                              talloc_tos(), 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;
@@ -1045,7 +1108,8 @@ bool run_smb2_multi_channel(int dummy)
                return false;
        }
 
-       status = gensec_update(auth_generic_state->gensec_security, talloc_tos(), ev, out_blob, &in_blob);
+       status = gensec_update(auth_generic_state->gensec_security,
+                              talloc_tos(), out_blob, &in_blob);
        if (!NT_STATUS_IS_OK(status)) {
                printf("auth_generic_update returned %s\n", nt_errstr(status));
                return false;
@@ -1095,9 +1159,8 @@ bool run_smb2_multi_channel(int dummy)
                return false;
        }
 
-       cli3->smb2.tid = cli2->smb2.tid;
-
-       status = smb2cli_create(cli2, "multi-channel.txt",
+       status = smb2cli_create(cli2->conn, cli2->timeout, cli2->smb2.session,
+                       cli1->smb2.tcon, "multi-channel.txt",
                        SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
                        SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
                        SEC_STD_ALL | SEC_FILE_ALL, /* desired_access, */
@@ -1107,40 +1170,46 @@ bool run_smb2_multi_channel(int dummy)
                        FILE_DELETE_ON_CLOSE, /* create_options, */
                        NULL, /* smb2_create_blobs *blobs */
                        &fid_persistent,
-                       &fid_volatile);
+                       &fid_volatile,
+                       NULL, NULL, NULL);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_create on cli2 %s\n", nt_errstr(status));
                return false;
        }
 
-       status = smb2cli_write(cli1, strlen(hello), 0, fid_persistent,
-                              fid_volatile, 0, 0, (const uint8_t *)hello);
+       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, NULL);
        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,
+                              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(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,
+                              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(cli2, 0x10000, 0, fid_persistent,
-                              fid_volatile, 2, 0,
-                              talloc_tos(), &result, &nread);
+       status = smb2cli_read(cli2->conn, cli2->timeout, cli2->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;
@@ -1158,25 +1227,195 @@ 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_creds(auth_generic_state, torture_creds);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("auth_generic_set_creds 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(), 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(), 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.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->conn, cli2->timeout, cli2->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->conn, cli3->timeout, cli3->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_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, */
+                       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,
+                       NULL, NULL, NULL);
+       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,
+                       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, */
+                       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,
+                       NULL, NULL, NULL);
+       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,
+                       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, */
+                       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,
+                       NULL, NULL, NULL);
+       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,
+                              cli1->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,
+                              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;
        }
 
-       status = smb2cli_flush(cli2, fid_persistent, fid_volatile);
+       status = smb2cli_flush(cli2->conn, cli2->timeout, cli2->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;
        }
 
-       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;
@@ -1198,16 +1437,19 @@ 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;
+       struct smbXcli_tcon *saved_tcon;
 
        printf("Starting SMB2-SESSION_REAUTH\n");
 
        if (!torture_init_connection(&cli)) {
                return false;
        }
-       cli->smb2.pid = 0xFEFF;
 
        /*
         * PROTOCOL_SMB2_22 has a bug in win8pre0
@@ -1222,22 +1464,20 @@ bool run_smb2_session_reauth(int dummy)
                return false;
        }
 
-       status = cli_session_setup(cli, username,
-                                  password, strlen(password),
-                                  password, strlen(password),
-                                  workgroup);
+       status = cli_session_setup_creds(cli, torture_creds);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_sesssetup returned %s\n", nt_errstr(status));
                return false;
        }
 
-       status = cli_tree_connect(cli, share, "?????", "", 0);
+       status = cli_tree_connect(cli, share, "?????", NULL);
        if (!NT_STATUS_IS_OK(status)) {
                printf("cli_tree_connect 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, */
@@ -1247,13 +1487,15 @@ bool run_smb2_session_reauth(int dummy)
                        FILE_DELETE_ON_CLOSE, /* create_options, */
                        NULL, /* smb2_create_blobs *blobs */
                        &fid_persistent,
-                       &fid_volatile);
+                       &fid_volatile,
+                       NULL, NULL, NULL);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_create %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|
@@ -1265,14 +1507,16 @@ bool run_smb2_session_reauth(int dummy)
                        FILE_SYNCHRONOUS_IO_NONALERT|FILE_DIRECTORY_FILE, /* create_options, */
                        NULL, /* smb2_create_blobs *blobs */
                        &dir_persistent,
-                       &dir_volatile);
+                       &dir_volatile,
+                       NULL, NULL, NULL);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_create 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)) {
@@ -1288,21 +1532,10 @@ bool run_smb2_session_reauth(int dummy)
 
        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);
+       status = auth_generic_set_creds(auth_generic_state, torture_creds);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("auth_generic_set_password returned %s\n", nt_errstr(status));
+               printf("auth_generic_set_creds returned %s\n", nt_errstr(status));
                return false;
        }
 
@@ -1312,13 +1545,14 @@ bool run_smb2_session_reauth(int dummy)
                return false;
        }
 
-       ev = event_context_init(talloc_tos());
+       ev = samba_tevent_context_init(talloc_tos());
        if (ev == NULL) {
-               printf("event_context_init() returned NULL\n");
+               printf("samba_tevent_context_init() returned NULL\n");
                return false;
        }
 
-       status = gensec_update(auth_generic_state->gensec_security, talloc_tos(), ev, data_blob_null, &in_blob);
+       status = gensec_update(auth_generic_state->gensec_security,
+                              talloc_tos(), 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;
@@ -1352,20 +1586,23 @@ bool run_smb2_session_reauth(int dummy)
                return false;
        }
 
-       status = gensec_update(auth_generic_state->gensec_security, talloc_tos(), ev, out_blob, &in_blob);
+       status = gensec_update(auth_generic_state->gensec_security,
+                              talloc_tos(), 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(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)) {
@@ -1373,7 +1610,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.tcon,
+                                   SMB2_0_INFO_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.tcon,
+                                   SMB2_0_INFO_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.tcon,
+                                 SMB2_0_INFO_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.tcon, "session-reauth-invalid.txt",
                        SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
                        SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
                        SEC_STD_ALL | SEC_FILE_ALL, /* desired_access, */
@@ -1383,13 +1682,15 @@ bool run_smb2_session_reauth(int dummy)
                        FILE_DELETE_ON_CLOSE, /* create_options, */
                        NULL, /* smb2_create_blobs *blobs */
                        &fid_persistent,
-                       &fid_volatile);
+                       &fid_volatile,
+                       NULL, NULL, NULL);
        if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_HANDLE)) {
                printf("smb2cli_create %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|
@@ -1401,19 +1702,30 @@ bool run_smb2_session_reauth(int dummy)
                        FILE_SYNCHRONOUS_IO_NONALERT|FILE_DIRECTORY_FILE, /* create_options, */
                        NULL, /* smb2_create_blobs *blobs */
                        &dir_persistent,
-                       &dir_volatile);
+                       &dir_volatile,
+                       NULL, NULL, NULL);
        if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_HANDLE)) {
                printf("smb2cli_create returned %s\n", nt_errstr(status));
                return false;
        }
 
-       saved_tid = cli->smb2.tid;
-       status = cli_tree_connect(cli, share, "?????", "", 0);
+       saved_tid = smb2cli_tcon_current_id(cli->smb2.tcon);
+       saved_tcon = cli->smb2.tcon;
+       cli->smb2.tcon = smbXcli_tcon_create(cli);
+       smb2cli_tcon_set_values(cli->smb2.tcon,
+                               NULL, /* session */
+                               saved_tid,
+                               0, /* type */
+                               0, /* flags */
+                               0, /* capabilities */
+                               0  /* maximal_access */);
+       status = cli_tree_connect(cli, share, "?????", NULL);
        if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_HANDLE)) {
                printf("cli_tree_connect returned %s\n", nt_errstr(status));
                return false;
        }
-       cli->smb2.tid = saved_tid;
+       talloc_free(cli->smb2.tcon);
+       cli->smb2.tcon = saved_tcon;
 
        subreq = smb2cli_session_setup_send(talloc_tos(), ev,
                                            cli->conn,
@@ -1443,19 +1755,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.tcon, 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.tcon,
+                                   SMB2_0_INFO_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.tcon,
+                                   SMB2_0_INFO_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.tcon,
+                                 SMB2_0_INFO_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.tcon,
+                                   SMB2_0_INFO_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.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, */
@@ -1465,14 +1858,16 @@ bool run_smb2_session_reauth(int dummy)
                        FILE_DELETE_ON_CLOSE, /* create_options, */
                        NULL, /* smb2_create_blobs *blobs */
                        &fid_persistent,
-                       &fid_volatile);
+                       &fid_volatile,
+                       NULL, NULL, NULL);
        if (!NT_STATUS_IS_OK(status)) {
                printf("smb2cli_create %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)) {
@@ -1480,25 +1875,463 @@ 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;
-       status = cli_tree_connect(cli, share, "?????", "", 0);
+       saved_tid = smb2cli_tcon_current_id(cli->smb2.tcon);
+       saved_tcon = cli->smb2.tcon;
+       cli->smb2.tcon = smbXcli_tcon_create(cli);
+       smb2cli_tcon_set_values(cli->smb2.tcon,
+                               NULL, /* session */
+                               saved_tid,
+                               0, /* type */
+                               0, /* flags */
+                               0, /* capabilities */
+                               0  /* maximal_access */);
+       status = cli_tree_connect(cli, share, "?????", NULL);
+       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;
+
+       return true;
+}
+
+static NTSTATUS check_size(struct cli_state *cli,
+                               uint16_t fnum,
+                               const char *fname,
+                               size_t size)
+{
+       off_t size_read = 0;
+
+       NTSTATUS status = cli_qfileinfo_basic(cli,
+                               fnum,
+                               NULL,
+                               &size_read,
+                               NULL,
+                               NULL,
+                               NULL,
+                               NULL,
+                               NULL);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("cli_smb2_qfileinfo_basic of %s failed (%s)\n",
+                       fname,
+                       nt_errstr(status));
+               return status;
+       }
+
+       if (size != size_read) {
+               printf("size (%u) != size_read(%u) for %s\n",
+                       (unsigned int)size,
+                       (unsigned int)size_read,
+                       fname);
+               /* Use EOF to mean bad size. */
+               return NT_STATUS_END_OF_FILE;
+       }
+       return NT_STATUS_OK;
+}
+
+/* Ensure cli_ftruncate() works for SMB2. */
+
+bool run_smb2_ftruncate(int dummy)
+{
+       struct cli_state *cli = NULL;
+       const char *fname = "smb2_ftruncate.txt";
+       uint16_t fnum = (uint16_t)-1;
+       bool correct = false;
+       size_t buflen = 1024*1024;
+       uint8_t *buf = NULL;
+       unsigned int i;
+       NTSTATUS status;
+
+       printf("Starting SMB2-FTRUNCATE\n");
+
+       if (!torture_init_connection(&cli)) {
+               goto fail;
+       }
+
+       status = smbXcli_negprot(cli->conn, cli->timeout,
+                                PROTOCOL_SMB2_02, PROTOCOL_SMB2_02);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("smbXcli_negprot returned %s\n", nt_errstr(status));
+               goto fail;
+       }
+
+       status = cli_session_setup_creds(cli, torture_creds);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("cli_session_setup returned %s\n", nt_errstr(status));
+               goto fail;
+       }
+
+       status = cli_tree_connect(cli, share, "?????", NULL);
        if (!NT_STATUS_IS_OK(status)) {
                printf("cli_tree_connect returned %s\n", nt_errstr(status));
+               goto fail;
+       }
+
+       cli_setatr(cli, fname, 0, 0);
+       cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+
+       status = cli_ntcreate(cli,
+                               fname,
+                               0,
+                               GENERIC_ALL_ACCESS,
+                               FILE_ATTRIBUTE_NORMAL,
+                               FILE_SHARE_NONE,
+                               FILE_CREATE,
+                               0,
+                               0,
+                               &fnum,
+                               NULL);
+
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("open of %s failed (%s)\n", fname, nt_errstr(status));
+                goto fail;
+        }
+
+       buf = talloc_zero_array(cli, uint8_t, buflen);
+       if (buf == NULL) {
+               goto fail;
+       }
+
+       /* Write 1MB. */
+       status = cli_writeall(cli,
+                               fnum,
+                               0,
+                               buf,
+                               0,
+                               buflen,
+                               NULL);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("write of %u to %s failed (%s)\n",
+                       (unsigned int)buflen,
+                       fname,
+                       nt_errstr(status));
+               goto fail;
+       }
+
+       status = check_size(cli, fnum, fname, buflen);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto fail;
+       }
+
+       /* Now ftruncate. */
+       for ( i = 0; i < 10; i++) {
+               status = cli_ftruncate(cli, fnum, i*1024);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("cli_ftruncate %u of %s failed (%s)\n",
+                               (unsigned int)i*1024,
+                               fname,
+                               nt_errstr(status));
+                       goto fail;
+               }
+               status = check_size(cli, fnum, fname, i*1024);
+               if (!NT_STATUS_IS_OK(status)) {
+                       goto fail;
+               }
+       }
+
+       correct = true;
+
+  fail:
+
+       if (cli == NULL) {
                return false;
        }
-       cli->smb2.tid = saved_tid;
 
+       if (fnum != (uint16_t)-1) {
+               cli_close(cli, fnum);
+       }
+       cli_setatr(cli, fname, 0, 0);
+       cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+
+       if (!torture_close_connection(cli)) {
+               correct = false;
+       }
+       return correct;
+}
+
+/* Ensure SMB2 flush on directories behaves correctly. */
+
+static bool test_dir_fsync(struct cli_state *cli, const char *path)
+{
+       NTSTATUS status;
+       uint64_t fid_persistent, fid_volatile;
+       uint8_t *dir_data = NULL;
+       uint32_t dir_data_length = 0;
+
+       /* Open directory - no write abilities. */
+       status = smb2cli_create(cli->conn, cli->timeout, cli->smb2.session,
+                       cli->smb2.tcon, path,
+                       SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
+                       SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
+                       SEC_STD_SYNCHRONIZE|
+                       SEC_DIR_LIST|
+                       SEC_DIR_READ_ATTRIBUTE, /* desired_access, */
+                       0, /* file_attributes, */
+                       FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, /* share_access, */
+                       FILE_OPEN, /* create_disposition, */
+                       FILE_SYNCHRONOUS_IO_NONALERT|FILE_DIRECTORY_FILE, /* create_options, */
+                       NULL, /* smb2_create_blobs *blobs */
+                       &fid_persistent,
+                       &fid_volatile,
+                       NULL, NULL, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("smb2cli_create '%s' (readonly) returned %s\n",
+                       path,
+                       nt_errstr(status));
+               return false;
+       }
+
+       status = smb2cli_query_directory(
+               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)) {
+               printf("smb2cli_query_directory returned %s\n",
+                       nt_errstr(status));
+               return false;
+       }
+
+       /* Open directory no write access. Flush should fail. */
+
+       status = smb2cli_flush(cli->conn, cli->timeout, cli->smb2.session,
+                              cli->smb2.tcon, fid_persistent, fid_volatile);
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED)) {
+               printf("smb2cli_flush on a read-only directory returned %s\n",
+                       nt_errstr(status));
+               return false;
+       }
+
+       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;
+       }
+
+       /* Open directory write-attributes only. Flush should still fail. */
+
+       status = smb2cli_create(cli->conn, cli->timeout, cli->smb2.session,
+                       cli->smb2.tcon, path,
+                       SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
+                       SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
+                       SEC_STD_SYNCHRONIZE|
+                       SEC_DIR_LIST|
+                       SEC_DIR_WRITE_ATTRIBUTE|
+                       SEC_DIR_READ_ATTRIBUTE, /* desired_access, */
+                       0, /* file_attributes, */
+                       FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, /* share_access, */
+                       FILE_OPEN, /* create_disposition, */
+                       FILE_SYNCHRONOUS_IO_NONALERT|FILE_DIRECTORY_FILE, /* create_options, */
+                       NULL, /* smb2_create_blobs *blobs */
+                       &fid_persistent,
+                       &fid_volatile,
+                       NULL, NULL, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("smb2cli_create '%s' (write attr) returned %s\n",
+                       path,
+                       nt_errstr(status));
+               return false;
+       }
+
+       status = smb2cli_query_directory(
+               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)) {
+               printf("smb2cli_query_directory returned %s\n", nt_errstr(status));
+               return false;
+       }
+
+       status = smb2cli_flush(cli->conn, cli->timeout, cli->smb2.session,
+                              cli->smb2.tcon, fid_persistent, fid_volatile);
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED)) {
+               printf("smb2cli_flush on a write-attributes directory "
+                       "returned %s\n",
+                       nt_errstr(status));
+               return false;
+       }
+
+       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;
+       }
+
+       /* Open directory with SEC_DIR_ADD_FILE access. Flush should now succeed. */
+
+       status = smb2cli_create(cli->conn, cli->timeout, cli->smb2.session,
+                       cli->smb2.tcon, path,
+                       SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
+                       SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
+                       SEC_STD_SYNCHRONIZE|
+                       SEC_DIR_LIST|
+                       SEC_DIR_ADD_FILE, /* desired_access, */
+                       0, /* file_attributes, */
+                       FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, /* share_access, */
+                       FILE_OPEN, /* create_disposition, */
+                       FILE_SYNCHRONOUS_IO_NONALERT|FILE_DIRECTORY_FILE, /* create_options, */
+                       NULL, /* smb2_create_blobs *blobs */
+                       &fid_persistent,
+                       &fid_volatile,
+                       NULL, NULL, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("smb2cli_create '%s' (write FILE access) returned %s\n",
+                       path,
+                       nt_errstr(status));
+               return false;
+       }
+
+       status = smb2cli_query_directory(
+               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)) {
+               printf("smb2cli_query_directory returned %s\n", nt_errstr(status));
+               return false;
+       }
+
+       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 on a directory returned %s\n",
+                       nt_errstr(status));
+               return false;
+       }
+
+       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;
+       }
+
+       /* Open directory with SEC_DIR_ADD_FILE access. Flush should now succeed. */
+
+       status = smb2cli_create(cli->conn, cli->timeout, cli->smb2.session,
+                       cli->smb2.tcon, path,
+                       SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
+                       SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
+                       SEC_STD_SYNCHRONIZE|
+                       SEC_DIR_LIST|
+                       SEC_DIR_ADD_SUBDIR, /* desired_access, */
+                       0, /* file_attributes, */
+                       FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, /* share_access, */
+                       FILE_OPEN, /* create_disposition, */
+                       FILE_SYNCHRONOUS_IO_NONALERT|FILE_DIRECTORY_FILE, /* create_options, */
+                       NULL, /* smb2_create_blobs *blobs */
+                       &fid_persistent,
+                       &fid_volatile,
+                       NULL, NULL, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("smb2cli_create '%s' (write DIR access) returned %s\n",
+                       path,
+                       nt_errstr(status));
+               return false;
+       }
+
+       status = smb2cli_query_directory(
+               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)) {
+               printf("smb2cli_query_directory returned %s\n", nt_errstr(status));
+               return false;
+       }
+
+       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 on a directory returned %s\n",
+                       nt_errstr(status));
+               return false;
+       }
+
+       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;
+       }
+
+
+       return true;
+}
+
+bool run_smb2_dir_fsync(int dummy)
+{
+       struct cli_state *cli = NULL;
+       NTSTATUS status;
+       bool bret = false;
+       const char *dname = "fsync_test_dir";
+
+       printf("Starting SMB2-DIR-FSYNC\n");
+
+       if (!torture_init_connection(&cli)) {
+               return false;
+       }
+
+       status = smbXcli_negprot(cli->conn, cli->timeout,
+                                PROTOCOL_SMB2_02, PROTOCOL_SMB2_02);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("smbXcli_negprot returned %s\n", nt_errstr(status));
+               return false;
+       }
+
+       status = cli_session_setup_creds(cli, torture_creds);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("cli_session_setup returned %s\n", nt_errstr(status));
+               return false;
+       }
+
+       status = cli_tree_connect(cli, share, "?????", NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("cli_tree_connect returned %s\n", nt_errstr(status));
+               return false;
+       }
+
+       (void)cli_rmdir(cli, dname);
+       status = cli_mkdir(cli, dname);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("cli_mkdir(%s) returned %s\n",
+                       dname,
+                       nt_errstr(status));
+               return false;
+       }
+
+       /* Test on a subdirectory. */
+       bret = test_dir_fsync(cli, dname);
+       if (bret == false) {
+               (void)cli_rmdir(cli, dname);
+               return false;
+       }
+       (void)cli_rmdir(cli, dname);
+
+       /* Test on the root handle of a share. */
+       bret = test_dir_fsync(cli, "");
+       if (bret == false) {
+               return false;
+       }
        return true;
 }