TODO smb1cli_tcon_set_optional support etc.
[obnox/samba/samba-obnox.git] / libcli / smb / smbXcli_base.c
index c2e628c34228573398409fea2caf97bee920021c..45fad761536509f89a6a077391b904c0aee9b31e 100644 (file)
@@ -24,6 +24,7 @@
 #include "../lib/util/tevent_ntstatus.h"
 #include "../lib/util/tevent_unix.h"
 #include "lib/util/util_net.h"
+#include "lib/util/dlinklist.h"
 #include "../libcli/smb/smb_common.h"
 #include "../libcli/smb/smb_seal.h"
 #include "../libcli/smb/smb_signing.h"
 #include "smbXcli_base.h"
 #include "librpc/ndr/libndr.h"
 
+struct smbXcli_conn;
+struct smbXcli_req;
+struct smbXcli_session;
+struct smbXcli_tcon;
+
 struct smbXcli_conn {
-       int fd;
+       int read_fd;
+       int write_fd;
        struct sockaddr_storage local_ss;
        struct sockaddr_storage remote_ss;
        const char *remote_name;
@@ -78,6 +85,7 @@ struct smbXcli_conn {
                        DATA_BLOB gss_blob;
                        uint8_t challenge[8];
                        const char *workgroup;
+                       const char *name;
                        int time_zone;
                        NTTIME system_time;
                } server;
@@ -89,11 +97,15 @@ struct smbXcli_conn {
 
                struct smb_signing_state *signing;
                struct smb_trans_enc_state *trans_enc;
+
+               struct tevent_req *read_braw_req;
        } smb1;
 
        struct {
                struct {
+                       uint32_t capabilities;
                        uint16_t security_mode;
+                       struct GUID guid;
                } client;
 
                struct {
@@ -109,12 +121,76 @@ struct smbXcli_conn {
                } server;
 
                uint64_t mid;
+               uint16_t cur_credits;
+               uint16_t max_credits;
+       } smb2;
+
+       struct smbXcli_session *sessions;
+};
+
+struct smb2cli_session {
+       uint64_t session_id;
+       uint16_t session_flags;
+       DATA_BLOB application_key;
+       DATA_BLOB signing_key;
+       bool should_sign;
+       bool should_encrypt;
+       DATA_BLOB encryption_key;
+       DATA_BLOB decryption_key;
+       uint64_t nonce_high;
+       uint64_t nonce_low;
+       uint16_t channel_sequence;
+};
+
+struct smbXcli_session {
+       struct smbXcli_session *prev, *next;
+       struct smbXcli_conn *conn;
+
+       struct {
+               uint16_t session_id;
+               DATA_BLOB application_key;
+               bool protected_key;
+       } smb1;
+
+       struct smb2cli_session *smb2;
+
+       struct {
+               DATA_BLOB signing_key;
+       } smb2_channel;
+
+       /*
+        * this should be a short term hack
+        * until the upper layers have implemented
+        * re-authentication.
+        */
+       bool disconnect_expired;
+};
+
+struct smbXcli_tcon {
+       struct {
+               uint16_t tcon_id;
+               uint16_t optional_support;
+               uint32_t maximal_access;
+               uint32_t guest_maximal_access;
+               char *service;
+               char *fs_type;
+       } smb1;
+
+       struct {
+               uint32_t tcon_id;
+               uint8_t type;
+               uint32_t flags;
+               uint32_t capabilities;
+               uint32_t maximal_access;
+               bool should_encrypt;
        } smb2;
 };
 
 struct smbXcli_req_state {
        struct tevent_context *ev;
        struct smbXcli_conn *conn;
+       struct smbXcli_session *session; /* maybe NULL */
+       struct smbXcli_tcon *tcon; /* maybe NULL */
 
        uint8_t length_hdr[4];
 
@@ -137,11 +213,12 @@ struct smbXcli_req_state {
                uint16_t *vwv;
                uint8_t bytecount_buf[2];
 
-#define MAX_SMB_IOV 5
+#define MAX_SMB_IOV 10
                /* length_hdr, hdr, words, byte_count, buffers */
                struct iovec iov[1 + 3 + MAX_SMB_IOV];
                int iov_count;
 
+               bool one_way_seqnum;
                uint32_t seqnum;
                struct tevent_req **chained_requests;
 
@@ -157,11 +234,27 @@ struct smbXcli_req_state {
                const uint8_t *dyn;
                uint32_t dyn_len;
 
-               uint8_t hdr[64];
+               uint8_t transform[SMB2_TF_HDR_SIZE];
+               uint8_t hdr[SMB2_HDR_BODY];
                uint8_t pad[7]; /* padding space for compounding */
 
-               /* always an array of 3 talloc elements */
+               /*
+                * always an array of 3 talloc elements
+                * (without a SMB2_TRANSFORM header!)
+                *
+                * HDR, BODY, DYN
+                */
                struct iovec *recv_iov;
+
+               uint16_t credit_charge;
+
+               bool should_sign;
+               bool should_encrypt;
+               uint64_t encryption_session_id;
+
+               bool signing_skipped;
+               bool notify_async;
+               bool got_async;
        } smb2;
 };
 
@@ -172,8 +265,13 @@ static int smbXcli_conn_destructor(struct smbXcli_conn *conn)
         */
        smbXcli_conn_disconnect(conn, NT_STATUS_OK);
 
+       while (conn->sessions) {
+               conn->sessions->conn = NULL;
+               DLIST_REMOVE(conn->sessions, conn->sessions);
+       }
+
        if (conn->smb1.trans_enc) {
-               common_free_encryption_state(&conn->smb1.trans_enc);
+               TALLOC_FREE(conn->smb1.trans_enc);
        }
 
        return 0;
@@ -183,7 +281,9 @@ struct smbXcli_conn *smbXcli_conn_create(TALLOC_CTX *mem_ctx,
                                         int fd,
                                         const char *remote_name,
                                         enum smb_signing_setting signing_state,
-                                        uint32_t smb1_capabilities)
+                                        uint32_t smb1_capabilities,
+                                        struct GUID *client_guid,
+                                        uint32_t smb2_capabilities)
 {
        struct smbXcli_conn *conn = NULL;
        void *ss = NULL;
@@ -196,12 +296,17 @@ struct smbXcli_conn *smbXcli_conn_create(TALLOC_CTX *mem_ctx,
                return NULL;
        }
 
+       conn->read_fd = fd;
+       conn->write_fd = dup(fd);
+       if (conn->write_fd == -1) {
+               goto error;
+       }
+
        conn->remote_name = talloc_strdup(conn, remote_name);
        if (conn->remote_name == NULL) {
                goto error;
        }
 
-       conn->fd = fd;
 
        ss = (void *)&conn->local_ss;
        sa = (struct sockaddr *)ss;
@@ -269,11 +374,21 @@ struct smbXcli_conn *smbXcli_conn_create(TALLOC_CTX *mem_ctx,
        if (conn->mandatory_signing) {
                conn->smb2.client.security_mode |= SMB2_NEGOTIATE_SIGNING_REQUIRED;
        }
+       if (client_guid) {
+               conn->smb2.client.guid = *client_guid;
+       }
+       conn->smb2.client.capabilities = smb2_capabilities;
+
+       conn->smb2.cur_credits = 1;
+       conn->smb2.max_credits = 0;
 
        talloc_set_destructor(conn, smbXcli_conn_destructor);
        return conn;
 
  error:
+       if (conn->write_fd != -1) {
+               close(conn->write_fd);
+       }
        TALLOC_FREE(conn);
        return NULL;
 }
@@ -284,7 +399,7 @@ bool smbXcli_conn_is_connected(struct smbXcli_conn *conn)
                return false;
        }
 
-       if (conn->fd == -1) {
+       if (conn->read_fd == -1) {
                return false;
        }
 
@@ -296,6 +411,45 @@ enum protocol_types smbXcli_conn_protocol(struct smbXcli_conn *conn)
        return conn->protocol;
 }
 
+bool smbXcli_conn_nt_smbs_supported(struct smbXcli_conn *conn)
+{
+       if (conn->protocol >= PROTOCOL_SMB2_02) {
+               return true;
+       }
+
+       if (smb1cli_conn_capabilities(conn) & CAP_NT_SMBS) {
+               return true;
+       }
+
+       return false;
+}
+
+bool smbXcli_conn_use_status32(struct smbXcli_conn *conn)
+{
+       if (conn->protocol >= PROTOCOL_SMB2_02) {
+               return true;
+       }
+
+       if (smb1cli_conn_capabilities(conn) & CAP_STATUS32) {
+               return true;
+       }
+
+       return false;
+}
+
+bool smbXcli_conn_use_large_files(struct smbXcli_conn *conn)
+{
+       if (conn->protocol >= PROTOCOL_SMB2_02) {
+               return true;
+       }
+
+       if (smb1cli_conn_capabilities(conn) & CAP_LARGE_FILES) {
+               return true;
+       }
+
+       return false;
+}
+
 bool smbXcli_conn_use_unicode(struct smbXcli_conn *conn)
 {
        if (conn->protocol >= PROTOCOL_SMB2_02) {
@@ -311,7 +465,7 @@ bool smbXcli_conn_use_unicode(struct smbXcli_conn *conn)
 
 void smbXcli_conn_set_sockopt(struct smbXcli_conn *conn, const char *options)
 {
-       set_socket_options(conn->fd, options);
+       set_socket_options(conn->read_fd, options);
 }
 
 const struct sockaddr_storage *smbXcli_conn_local_sockaddr(struct smbXcli_conn *conn)
@@ -329,6 +483,192 @@ const char *smbXcli_conn_remote_name(struct smbXcli_conn *conn)
        return conn->remote_name;
 }
 
+uint16_t smbXcli_conn_max_requests(struct smbXcli_conn *conn)
+{
+       if (conn->protocol >= PROTOCOL_SMB2_02) {
+               /*
+                * TODO...
+                */
+               return 1;
+       }
+
+       return conn->smb1.server.max_mux;
+}
+
+NTTIME smbXcli_conn_server_system_time(struct smbXcli_conn *conn)
+{
+       if (conn->protocol >= PROTOCOL_SMB2_02) {
+               return conn->smb2.server.system_time;
+       }
+
+       return conn->smb1.server.system_time;
+}
+
+const DATA_BLOB *smbXcli_conn_server_gss_blob(struct smbXcli_conn *conn)
+{
+       if (conn->protocol >= PROTOCOL_SMB2_02) {
+               return &conn->smb2.server.gss_blob;
+       }
+
+       return &conn->smb1.server.gss_blob;
+}
+
+const struct GUID *smbXcli_conn_server_guid(struct smbXcli_conn *conn)
+{
+       if (conn->protocol >= PROTOCOL_SMB2_02) {
+               return &conn->smb2.server.guid;
+       }
+
+       return &conn->smb1.server.guid;
+}
+
+struct smbXcli_conn_samba_suicide_state {
+       struct smbXcli_conn *conn;
+       struct iovec iov;
+       uint8_t buf[9];
+};
+
+static void smbXcli_conn_samba_suicide_done(struct tevent_req *subreq);
+
+struct tevent_req *smbXcli_conn_samba_suicide_send(TALLOC_CTX *mem_ctx,
+                                                  struct tevent_context *ev,
+                                                  struct smbXcli_conn *conn,
+                                                  uint8_t exitcode)
+{
+       struct tevent_req *req, *subreq;
+       struct smbXcli_conn_samba_suicide_state *state;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct smbXcli_conn_samba_suicide_state);
+       if (req == NULL) {
+               return NULL;
+       }
+       state->conn = conn;
+       SIVAL(state->buf, 4, 0x74697865);
+       SCVAL(state->buf, 8, exitcode);
+       _smb_setlen_nbt(state->buf, sizeof(state->buf)-4);
+
+       state->iov.iov_base = state->buf;
+       state->iov.iov_len = sizeof(state->buf);
+
+       subreq = writev_send(state, ev, conn->outgoing, conn->write_fd,
+                            false, &state->iov, 1);
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
+       }
+       tevent_req_set_callback(subreq, smbXcli_conn_samba_suicide_done, req);
+       return req;
+}
+
+static void smbXcli_conn_samba_suicide_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct smbXcli_conn_samba_suicide_state *state = tevent_req_data(
+               req, struct smbXcli_conn_samba_suicide_state);
+       ssize_t nwritten;
+       int err;
+
+       nwritten = writev_recv(subreq, &err);
+       TALLOC_FREE(subreq);
+       if (nwritten == -1) {
+               NTSTATUS status = map_nt_error_from_unix_common(err);
+               smbXcli_conn_disconnect(state->conn, status);
+               return;
+       }
+       tevent_req_done(req);
+}
+
+NTSTATUS smbXcli_conn_samba_suicide_recv(struct tevent_req *req)
+{
+       return tevent_req_simple_recv_ntstatus(req);
+}
+
+NTSTATUS smbXcli_conn_samba_suicide(struct smbXcli_conn *conn,
+                                   uint8_t exitcode)
+{
+       TALLOC_CTX *frame = talloc_stackframe();
+       struct tevent_context *ev;
+       struct tevent_req *req;
+       NTSTATUS status = NT_STATUS_NO_MEMORY;
+       bool ok;
+
+       if (smbXcli_conn_has_async_calls(conn)) {
+               /*
+                * Can't use sync call while an async call is in flight
+                */
+               status = NT_STATUS_INVALID_PARAMETER_MIX;
+               goto fail;
+       }
+       ev = samba_tevent_context_init(frame);
+       if (ev == NULL) {
+               goto fail;
+       }
+       req = smbXcli_conn_samba_suicide_send(frame, ev, conn, exitcode);
+       if (req == NULL) {
+               goto fail;
+       }
+       ok = tevent_req_poll(req, ev);
+       if (!ok) {
+               status = map_nt_error_from_unix_common(errno);
+               goto fail;
+       }
+       status = smbXcli_conn_samba_suicide_recv(req);
+ fail:
+       TALLOC_FREE(frame);
+       return status;
+}
+
+uint32_t smb1cli_conn_capabilities(struct smbXcli_conn *conn)
+{
+       return conn->smb1.capabilities;
+}
+
+uint32_t smb1cli_conn_max_xmit(struct smbXcli_conn *conn)
+{
+       return conn->smb1.max_xmit;
+}
+
+uint32_t smb1cli_conn_server_session_key(struct smbXcli_conn *conn)
+{
+       return conn->smb1.server.session_key;
+}
+
+const uint8_t *smb1cli_conn_server_challenge(struct smbXcli_conn *conn)
+{
+       return conn->smb1.server.challenge;
+}
+
+uint16_t smb1cli_conn_server_security_mode(struct smbXcli_conn *conn)
+{
+       return conn->smb1.server.security_mode;
+}
+
+bool smb1cli_conn_server_readbraw(struct smbXcli_conn *conn)
+{
+       return conn->smb1.server.readbraw;
+}
+
+bool smb1cli_conn_server_writebraw(struct smbXcli_conn *conn)
+{
+       return conn->smb1.server.writebraw;
+}
+
+bool smb1cli_conn_server_lockread(struct smbXcli_conn *conn)
+{
+       return conn->smb1.server.lockread;
+}
+
+bool smb1cli_conn_server_writeunlock(struct smbXcli_conn *conn)
+{
+       return conn->smb1.server.writeunlock;
+}
+
+int smb1cli_conn_server_time_zone(struct smbXcli_conn *conn)
+{
+       return conn->smb1.server.time_zone;
+}
+
 bool smb1cli_conn_activate_signing(struct smbXcli_conn *conn,
                                   const DATA_BLOB user_session_key,
                                   const DATA_BLOB response)
@@ -341,7 +681,10 @@ bool smb1cli_conn_activate_signing(struct smbXcli_conn *conn,
 bool smb1cli_conn_check_signing(struct smbXcli_conn *conn,
                                const uint8_t *buf, uint32_t seqnum)
 {
-       return smb_signing_check_pdu(conn->smb1.signing, buf, seqnum);
+       const uint8_t *hdr = buf + NBT_HDR_SIZE;
+       size_t len = smb_len_nbt(buf);
+
+       return smb_signing_check_pdu(conn->smb1.signing, hdr, len, seqnum);
 }
 
 bool smb1cli_conn_signing_is_active(struct smbXcli_conn *conn)
@@ -354,7 +697,7 @@ void smb1cli_conn_set_encryption(struct smbXcli_conn *conn,
 {
        /* Replace the old state, if any. */
        if (conn->smb1.trans_enc) {
-               common_free_encryption_state(&conn->smb1.trans_enc);
+               TALLOC_FREE(conn->smb1.trans_enc);
        }
        conn->smb1.trans_enc = es;
 }
@@ -506,6 +849,30 @@ static int smbXcli_req_destructor(struct tevent_req *req)
        return 0;
 }
 
+static bool smb1cli_req_cancel(struct tevent_req *req);
+static bool smb2cli_req_cancel(struct tevent_req *req);
+
+static bool smbXcli_req_cancel(struct tevent_req *req)
+{
+       struct smbXcli_req_state *state =
+               tevent_req_data(req,
+               struct smbXcli_req_state);
+
+       if (!smbXcli_conn_is_connected(state->conn)) {
+               return false;
+       }
+
+       if (state->conn->protocol == PROTOCOL_NONE) {
+               return false;
+       }
+
+       if (state->conn->protocol >= PROTOCOL_SMB2_02) {
+               return smb2cli_req_cancel(req);
+       }
+
+       return smb1cli_req_cancel(req);
+}
+
 static bool smbXcli_conn_receive_next(struct smbXcli_conn *conn);
 
 bool smbXcli_req_set_pending(struct tevent_req *req)
@@ -533,6 +900,7 @@ bool smbXcli_req_set_pending(struct tevent_req *req)
        pending[num_pending] = req;
        conn->pending = pending;
        talloc_set_destructor(req, smbXcli_req_destructor);
+       tevent_req_set_cancel_fn(req, smbXcli_req_cancel);
 
        if (!smbXcli_conn_receive_next(conn)) {
                /*
@@ -583,7 +951,9 @@ static bool smbXcli_conn_receive_next(struct smbXcli_conn *conn)
         * We're the first ones, add the read_smb request that waits for the
         * answer from the server
         */
-       conn->read_smb_req = read_smb_send(conn->pending, state->ev, conn->fd);
+       conn->read_smb_req = read_smb_send(conn->pending,
+                                          state->ev,
+                                          conn->read_fd);
        if (conn->read_smb_req == NULL) {
                return false;
        }
@@ -593,10 +963,30 @@ static bool smbXcli_conn_receive_next(struct smbXcli_conn *conn)
 
 void smbXcli_conn_disconnect(struct smbXcli_conn *conn, NTSTATUS status)
 {
-       if (conn->fd != -1) {
-               close(conn->fd);
+       struct smbXcli_session *session;
+
+       tevent_queue_stop(conn->outgoing);
+
+       if (conn->read_fd != -1) {
+               close(conn->read_fd);
+       }
+       if (conn->write_fd != -1) {
+               close(conn->write_fd);
+       }
+       conn->read_fd = -1;
+       conn->write_fd = -1;
+
+       session = conn->sessions;
+       if (talloc_array_length(conn->pending) == 0) {
+               /*
+                * if we do not have pending requests
+                * there is no need to update the channel_sequence
+                */
+               session = NULL;
+       }
+       for (; session; session = session->next) {
+               smb2cli_session_increment_channel_sequence(session);
        }
-       conn->fd = -1;
 
        /*
         * Cancel all pending requests. We do not do a for-loop walking
@@ -658,7 +1048,7 @@ void smbXcli_conn_disconnect(struct smbXcli_conn *conn, NTSTATUS status)
 
                        /*
                         * we need to defer the callback, because we may notify
-                        * more then one caller.
+                        * more than one caller.
                         */
                        tevent_req_defer_callback(req, state->ev);
                        tevent_req_nterror(req, status);
@@ -788,6 +1178,60 @@ static void smb1cli_req_flags(enum protocol_types protocol,
        *_flags2 = flags2;
 }
 
+static void smb1cli_req_cancel_done(struct tevent_req *subreq);
+
+static bool smb1cli_req_cancel(struct tevent_req *req)
+{
+       struct smbXcli_req_state *state =
+               tevent_req_data(req,
+               struct smbXcli_req_state);
+       uint8_t flags;
+       uint16_t flags2;
+       uint32_t pid;
+       uint16_t mid;
+       struct tevent_req *subreq;
+       NTSTATUS status;
+
+       flags = CVAL(state->smb1.hdr, HDR_FLG);
+       flags2 = SVAL(state->smb1.hdr, HDR_FLG2);
+       pid  = SVAL(state->smb1.hdr, HDR_PID);
+       pid |= SVAL(state->smb1.hdr, HDR_PIDHIGH)<<16;
+       mid = SVAL(state->smb1.hdr, HDR_MID);
+
+       subreq = smb1cli_req_create(state, state->ev,
+                                   state->conn,
+                                   SMBntcancel,
+                                   flags, 0,
+                                   flags2, 0,
+                                   0, /* timeout */
+                                   pid,
+                                   state->tcon,
+                                   state->session,
+                                   0, NULL, /* vwv */
+                                   0, NULL); /* bytes */
+       if (subreq == NULL) {
+               return false;
+       }
+       smb1cli_req_set_mid(subreq, mid);
+
+       status = smb1cli_req_chain_submit(&subreq, 1);
+       if (!NT_STATUS_IS_OK(status)) {
+               TALLOC_FREE(subreq);
+               return false;
+       }
+       smb1cli_req_set_mid(subreq, 0);
+
+       tevent_req_set_callback(subreq, smb1cli_req_cancel_done, NULL);
+
+       return true;
+}
+
+static void smb1cli_req_cancel_done(struct tevent_req *subreq)
+{
+       /* we do not care about the result */
+       TALLOC_FREE(subreq);
+}
+
 struct tevent_req *smb1cli_req_create(TALLOC_CTX *mem_ctx,
                                      struct tevent_context *ev,
                                      struct smbXcli_conn *conn,
@@ -798,8 +1242,8 @@ struct tevent_req *smb1cli_req_create(TALLOC_CTX *mem_ctx,
                                      uint16_t clear_flags2,
                                      uint32_t timeout_msec,
                                      uint32_t pid,
-                                     uint16_t tid,
-                                     uint16_t uid,
+                                     struct smbXcli_tcon *tcon,
+                                     struct smbXcli_session *session,
                                      uint8_t wct, uint16_t *vwv,
                                      int iov_count,
                                      struct iovec *bytes_iov)
@@ -808,6 +1252,8 @@ struct tevent_req *smb1cli_req_create(TALLOC_CTX *mem_ctx,
        struct smbXcli_req_state *state;
        uint8_t flags = 0;
        uint16_t flags2 = 0;
+       uint16_t uid = 0;
+       uint16_t tid = 0;
 
        if (iov_count > MAX_SMB_IOV) {
                /*
@@ -823,6 +1269,16 @@ struct tevent_req *smb1cli_req_create(TALLOC_CTX *mem_ctx,
        }
        state->ev = ev;
        state->conn = conn;
+       state->session = session;
+       state->tcon = tcon;
+
+       if (session) {
+               uid = session->smb1.session_id;
+       }
+
+       if (tcon) {
+               tid = tcon->smb1.tcon_id;
+       }
 
        state->smb1.recv_cmd = 0xFF;
        state->smb1.recv_status = NT_STATUS_INTERNAL_ERROR;
@@ -852,7 +1308,7 @@ struct tevent_req *smb1cli_req_create(TALLOC_CTX *mem_ctx,
        SSVAL(state->smb1.hdr, HDR_PID,     pid);
        SSVAL(state->smb1.hdr, HDR_UID,     uid);
        SSVAL(state->smb1.hdr, HDR_MID,     0); /* this comes later */
-       SSVAL(state->smb1.hdr, HDR_WCT,     wct);
+       SCVAL(state->smb1.hdr, HDR_WCT,     wct);
 
        state->smb1.vwv = vwv;
 
@@ -886,8 +1342,11 @@ struct tevent_req *smb1cli_req_create(TALLOC_CTX *mem_ctx,
        case SMBtranss:
        case SMBtranss2:
        case SMBnttranss:
+               state->one_way = true;
+               break;
        case SMBntcancel:
                state->one_way = true;
+               state->smb1.one_way_seqnum = true;
                break;
        case SMBlockingX:
                if ((wct == 8) &&
@@ -902,8 +1361,10 @@ struct tevent_req *smb1cli_req_create(TALLOC_CTX *mem_ctx,
 
 static NTSTATUS smb1cli_conn_signv(struct smbXcli_conn *conn,
                                   struct iovec *iov, int iov_count,
-                                  uint32_t *seqnum)
+                                  uint32_t *seqnum,
+                                  bool one_way_seqnum)
 {
+       TALLOC_CTX *frame = NULL;
        uint8_t *buf;
 
        /*
@@ -927,16 +1388,21 @@ static NTSTATUS smb1cli_conn_signv(struct smbXcli_conn *conn,
                return NT_STATUS_INVALID_PARAMETER_MIX;
        }
 
-       buf = smbXcli_iov_concat(talloc_tos(), iov, iov_count);
+       frame = talloc_stackframe();
+
+       buf = smbXcli_iov_concat(frame, &iov[1], iov_count - 1);
        if (buf == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       *seqnum = smb_signing_next_seqnum(conn->smb1.signing, false);
-       smb_signing_sign_pdu(conn->smb1.signing, buf, *seqnum);
-       memcpy(iov[1].iov_base, buf+4, iov[1].iov_len);
+       *seqnum = smb_signing_next_seqnum(conn->smb1.signing,
+                                         one_way_seqnum);
+       smb_signing_sign_pdu(conn->smb1.signing,
+                            buf, talloc_get_size(buf),
+                            *seqnum);
+       memcpy(iov[1].iov_base, buf, iov[1].iov_len);
 
-       TALLOC_FREE(buf);
+       TALLOC_FREE(frame);
        return NT_STATUS_OK;
 }
 
@@ -951,6 +1417,7 @@ static NTSTATUS smb1cli_req_writev_submit(struct tevent_req *req,
 {
        struct tevent_req *subreq;
        NTSTATUS status;
+       uint8_t cmd;
        uint16_t mid;
 
        if (!smbXcli_conn_is_connected(state->conn)) {
@@ -977,6 +1444,14 @@ static NTSTATUS smb1cli_req_writev_submit(struct tevent_req *req,
                return NT_STATUS_INVALID_PARAMETER_MIX;
        }
 
+       cmd = CVAL(iov[1].iov_base, HDR_COM);
+       if (cmd == SMBreadBraw) {
+               if (smbXcli_conn_has_async_calls(state->conn)) {
+                       return NT_STATUS_INVALID_PARAMETER_MIX;
+               }
+               state->conn->smb1.read_braw_req = req;
+       }
+
        if (state->smb1.mid != 0) {
                mid = state->smb1.mid;
        } else {
@@ -987,7 +1462,8 @@ static NTSTATUS smb1cli_req_writev_submit(struct tevent_req *req,
        _smb_setlen_nbt(iov[0].iov_base, smbXcli_iov_len(&iov[1], iov_count-1));
 
        status = smb1cli_conn_signv(state->conn, iov, iov_count,
-                                   &state->smb1.seqnum);
+                                   &state->smb1.seqnum,
+                                   state->smb1.one_way_seqnum);
 
        if (!NT_STATUS_IS_OK(status)) {
                return status;
@@ -1027,8 +1503,10 @@ static NTSTATUS smb1cli_req_writev_submit(struct tevent_req *req,
                state->conn->dispatch_incoming = smb1cli_conn_dispatch_incoming;
        }
 
+       tevent_req_set_cancel_fn(req, smbXcli_req_cancel);
+
        subreq = writev_send(state, state->ev, state->conn->outgoing,
-                            state->conn->fd, false, iov, iov_count);
+                            state->conn->write_fd, false, iov, iov_count);
        if (subreq == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -1046,8 +1524,8 @@ struct tevent_req *smb1cli_req_send(TALLOC_CTX *mem_ctx,
                                    uint16_t clear_flags2,
                                    uint32_t timeout_msec,
                                    uint32_t pid,
-                                   uint16_t tid,
-                                   uint16_t uid,
+                                   struct smbXcli_tcon *tcon,
+                                   struct smbXcli_session *session,
                                    uint8_t wct, uint16_t *vwv,
                                    uint32_t num_bytes,
                                    const uint8_t *bytes)
@@ -1063,7 +1541,7 @@ struct tevent_req *smb1cli_req_send(TALLOC_CTX *mem_ctx,
                                 additional_flags, clear_flags,
                                 additional_flags2, clear_flags2,
                                 timeout_msec,
-                                pid, tid, uid,
+                                pid, tcon, session,
                                 wct, vwv, 1, &iov);
        if (req == NULL) {
                return NULL;
@@ -1176,13 +1654,27 @@ static NTSTATUS smb1cli_inbuf_parse_chain(uint8_t *buf, TALLOC_CTX *mem_ctx,
        uint8_t *hdr;
        uint8_t cmd;
        uint32_t wct_ofs;
+       NTSTATUS status;
+       size_t min_size = MIN_SMB_SIZE;
 
-       buflen = smb_len_nbt(buf);
+       buflen = smb_len_tcp(buf);
        taken = 0;
 
        hdr = buf + NBT_HDR_SIZE;
 
-       if (buflen < MIN_SMB_SIZE) {
+       status = smb1cli_pull_raw_error(hdr);
+       if (NT_STATUS_IS_ERR(status)) {
+               /*
+                * This is an ugly hack to support OS/2
+                * which skips the byte_count in the DATA block
+                * on some error responses.
+                *
+                * See bug #9096
+                */
+               min_size -= sizeof(uint16_t);
+       }
+
+       if (buflen < min_size) {
                return NT_STATUS_INVALID_NETWORK_RESPONSE;
        }
 
@@ -1223,9 +1715,9 @@ static NTSTATUS smb1cli_inbuf_parse_chain(uint8_t *buf, TALLOC_CTX *mem_ctx,
                size_t needed;
 
                /*
-                * we need at least WCT and BCC
+                * we need at least WCT
                 */
-               needed = sizeof(uint8_t) + sizeof(uint16_t);
+               needed = sizeof(uint8_t);
                if (len < needed) {
                        DEBUG(10, ("%s: %d bytes left, expected at least %d\n",
                                   __location__, (int)len, (int)needed));
@@ -1243,7 +1735,47 @@ static NTSTATUS smb1cli_inbuf_parse_chain(uint8_t *buf, TALLOC_CTX *mem_ctx,
                        goto inval;
                }
 
-               /*
+               if ((num_iov == 1) &&
+                   (len == needed) &&
+                   NT_STATUS_IS_ERR(status))
+               {
+                       /*
+                        * This is an ugly hack to support OS/2
+                        * which skips the byte_count in the DATA block
+                        * on some error responses.
+                        *
+                        * See bug #9096
+                        */
+                       iov_tmp = talloc_realloc(mem_ctx, iov, struct iovec,
+                                                num_iov + 2);
+                       if (iov_tmp == NULL) {
+                               TALLOC_FREE(iov);
+                               return NT_STATUS_NO_MEMORY;
+                       }
+                       iov = iov_tmp;
+                       cur = &iov[num_iov];
+                       num_iov += 2;
+
+                       cur[0].iov_len = 0;
+                       cur[0].iov_base = hdr + (wct_ofs + sizeof(uint8_t));
+                       cur[1].iov_len = 0;
+                       cur[1].iov_base = cur[0].iov_base;
+
+                       taken += needed;
+                       break;
+               }
+
+               /*
+                * we need at least BCC
+                */
+               needed += sizeof(uint16_t);
+               if (len < needed) {
+                       DEBUG(10, ("%s: %d bytes left, expected at least %d\n",
+                                  __location__, (int)len, (int)needed));
+                       goto inval;
+               }
+
+               /*
                 * Now we check if the specified bytes are there
                 */
                bcc_ofs = wct_ofs + sizeof(uint8_t) + wct * sizeof(uint16_t);
@@ -1351,13 +1883,48 @@ static NTSTATUS smb1cli_conn_dispatch_incoming(struct smbXcli_conn *conn,
        uint8_t cmd;
        uint16_t mid;
        bool oplock_break;
-       const uint8_t *inhdr = inbuf + NBT_HDR_SIZE;
+       uint8_t *inhdr = inbuf + NBT_HDR_SIZE;
+       size_t len = smb_len_tcp(inbuf);
        struct iovec *iov = NULL;
        int num_iov = 0;
        struct tevent_req **chain = NULL;
        size_t num_chained = 0;
        size_t num_responses = 0;
 
+       if (conn->smb1.read_braw_req != NULL) {
+               req = conn->smb1.read_braw_req;
+               conn->smb1.read_braw_req = NULL;
+               state = tevent_req_data(req, struct smbXcli_req_state);
+
+               smbXcli_req_unset_pending(req);
+
+               if (state->smb1.recv_iov == NULL) {
+                       /*
+                        * For requests with more than
+                        * one response, we have to readd the
+                        * recv_iov array.
+                        */
+                       state->smb1.recv_iov = talloc_zero_array(state,
+                                                                struct iovec,
+                                                                3);
+                       if (tevent_req_nomem(state->smb1.recv_iov, req)) {
+                               return NT_STATUS_OK;
+                       }
+               }
+
+               state->smb1.recv_iov[0].iov_base = (void *)(inhdr);
+               state->smb1.recv_iov[0].iov_len = len;
+               ZERO_STRUCT(state->smb1.recv_iov[1]);
+               ZERO_STRUCT(state->smb1.recv_iov[2]);
+
+               state->smb1.recv_cmd = SMBreadBraw;
+               state->smb1.recv_status = NT_STATUS_OK;
+               state->inbuf = talloc_move(state->smb1.recv_iov, &inbuf);
+
+               tevent_req_done(req);
+               return NT_STATUS_OK;
+       }
+
        if ((IVAL(inhdr, 0) != SMB_MAGIC) /* 0xFF"SMB" */
            && (SVAL(inhdr, 0) != 0x45ff)) /* 0xFF"E" */ {
                DEBUG(10, ("Got non-SMB PDU\n"));
@@ -1393,6 +1960,8 @@ static NTSTATUS smb1cli_conn_dispatch_incoming(struct smbXcli_conn *conn,
                                   nt_errstr(status)));
                        return status;
                }
+               inhdr = inbuf + NBT_HDR_SIZE;
+               len = smb_len_nbt(inbuf);
        }
 
        mid = SVAL(inhdr, HDR_MID);
@@ -1414,7 +1983,7 @@ static NTSTATUS smb1cli_conn_dispatch_incoming(struct smbXcli_conn *conn,
                /*
                 * Paranoia checks that this is really an oplock break request.
                 */
-               oplock_break = (smb_len_nbt(inbuf) == 51); /* hdr + 8 words */
+               oplock_break = (len == 51); /* hdr + 8 words */
                oplock_break &= ((CVAL(inhdr, HDR_FLG) & FLAG_REPLY) == 0);
                oplock_break &= (CVAL(inhdr, HDR_COM) == SMBlockingX);
                oplock_break &= (SVAL(inhdr, HDR_VWV+VWV(6)) == 0);
@@ -1431,7 +2000,7 @@ static NTSTATUS smb1cli_conn_dispatch_incoming(struct smbXcli_conn *conn,
 
        if (!oplock_break /* oplock breaks are not signed */
            && !smb_signing_check_pdu(conn->smb1.signing,
-                                     inbuf, state->smb1.seqnum+1)) {
+                                     inhdr, len, state->smb1.seqnum+1)) {
                DEBUG(10, ("cli_check_sign_mac failed\n"));
                return NT_STATUS_ACCESS_DENIED;
        }
@@ -1447,6 +2016,17 @@ static NTSTATUS smb1cli_conn_dispatch_incoming(struct smbXcli_conn *conn,
        cmd = CVAL(inhdr, HDR_COM);
        status = smb1cli_pull_raw_error(inhdr);
 
+       if (NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_SESSION_EXPIRED) &&
+           (state->session != NULL) && state->session->disconnect_expired)
+       {
+               /*
+                * this should be a short term hack
+                * until the upper layers have implemented
+                * re-authentication.
+                */
+               return status;
+       }
+
        if (state->smb1.chained_requests == NULL) {
                if (num_iov != 3) {
                        return NT_STATUS_INVALID_NETWORK_RESPONSE;
@@ -1454,6 +2034,20 @@ static NTSTATUS smb1cli_conn_dispatch_incoming(struct smbXcli_conn *conn,
 
                smbXcli_req_unset_pending(req);
 
+               if (state->smb1.recv_iov == NULL) {
+                       /*
+                        * For requests with more than
+                        * one response, we have to readd the
+                        * recv_iov array.
+                        */
+                       state->smb1.recv_iov = talloc_zero_array(state,
+                                                                struct iovec,
+                                                                3);
+                       if (tevent_req_nomem(state->smb1.recv_iov, req)) {
+                               return NT_STATUS_OK;
+                       }
+               }
+
                state->smb1.recv_cmd = cmd;
                state->smb1.recv_status = status;
                state->inbuf = talloc_move(state->smb1.recv_iov, &inbuf);
@@ -1502,6 +2096,20 @@ static NTSTATUS smb1cli_conn_dispatch_incoming(struct smbXcli_conn *conn,
                        continue;
                }
 
+               if (state->smb1.recv_iov == NULL) {
+                       /*
+                        * For requests with more than
+                        * one response, we have to readd the
+                        * recv_iov array.
+                        */
+                       state->smb1.recv_iov = talloc_zero_array(state,
+                                                                struct iovec,
+                                                                3);
+                       if (tevent_req_nomem(state->smb1.recv_iov, req)) {
+                               continue;
+                       }
+               }
+
                state->smb1.recv_cmd = cmd;
 
                if (i == (num_responses - 1)) {
@@ -1596,13 +2204,16 @@ NTSTATUS smb1cli_req_recv(struct tevent_req *req,
 
        if (state->inbuf != NULL) {
                recv_iov = state->smb1.recv_iov;
-               hdr = (uint8_t *)recv_iov[0].iov_base;
-               wct = recv_iov[1].iov_len/2;
-               vwv = (uint16_t *)recv_iov[1].iov_base;
-               vwv_offset = PTR_DIFF(vwv, hdr);
-               num_bytes = recv_iov[2].iov_len;
-               bytes = (uint8_t *)recv_iov[2].iov_base;
-               bytes_offset = PTR_DIFF(bytes, hdr);
+               state->smb1.recv_iov = NULL;
+               if (state->smb1.recv_cmd != SMBreadBraw) {
+                       hdr = (uint8_t *)recv_iov[0].iov_base;
+                       wct = recv_iov[1].iov_len/2;
+                       vwv = (uint16_t *)recv_iov[1].iov_base;
+                       vwv_offset = PTR_DIFF(vwv, hdr);
+                       num_bytes = recv_iov[2].iov_len;
+                       bytes = (uint8_t *)recv_iov[2].iov_base;
+                       bytes_offset = PTR_DIFF(bytes, hdr);
+               }
        }
 
        if (tevent_req_is_nterror(req, &status)) {
@@ -1858,6 +2469,140 @@ bool smbXcli_conn_has_async_calls(struct smbXcli_conn *conn)
                || (talloc_array_length(conn->pending) != 0));
 }
 
+bool smbXcli_conn_dfs_supported(struct smbXcli_conn *conn)
+{
+       if (conn->protocol >= PROTOCOL_SMB2_02) {
+               if (smb2cli_conn_server_capabilities(conn) & SMB2_CAP_DFS) {
+                       return true;
+               }
+
+               return false;
+       }
+
+       if (smb1cli_conn_capabilities(conn) & CAP_DFS) {
+               return true;
+       }
+       
+       return false;
+}
+
+bool smbXcli_tcon_is_dfsroot(struct smbXcli_tcon *tcon)
+{
+       return tcon->is_dfsroot;
+}
+
+void smb1cli_tcon_set_optional_support(struct smbXcli_tcon *tcon,
+                                      uint16_t optional)
+{
+       if (tcon->conn == NULL) {
+               return;
+       }
+
+       if (optional & SMB_SHARE_IN_DFS) {
+               tcon->is_dfsroot = true;
+       }
+
+       if (!(smb1cli_conn_capabilities(tcon->conn) & CAP_DFS)) {
+               tcon->is_dfsroot = false;
+       }
+}
+
+uint32_t smb2cli_conn_server_capabilities(struct smbXcli_conn *conn)
+{
+       return conn->smb2.server.capabilities;
+}
+
+uint16_t smb2cli_conn_server_security_mode(struct smbXcli_conn *conn)
+{
+       return conn->smb2.server.security_mode;
+}
+
+uint32_t smb2cli_conn_max_trans_size(struct smbXcli_conn *conn)
+{
+       return conn->smb2.server.max_trans_size;
+}
+
+uint32_t smb2cli_conn_max_read_size(struct smbXcli_conn *conn)
+{
+       return conn->smb2.server.max_read_size;
+}
+
+uint32_t smb2cli_conn_max_write_size(struct smbXcli_conn *conn)
+{
+       return conn->smb2.server.max_write_size;
+}
+
+void smb2cli_conn_set_max_credits(struct smbXcli_conn *conn,
+                                 uint16_t max_credits)
+{
+       conn->smb2.max_credits = max_credits;
+}
+
+static void smb2cli_req_cancel_done(struct tevent_req *subreq);
+
+static bool smb2cli_req_cancel(struct tevent_req *req)
+{
+       struct smbXcli_req_state *state =
+               tevent_req_data(req,
+               struct smbXcli_req_state);
+       uint32_t flags = IVAL(state->smb2.hdr, SMB2_HDR_FLAGS);
+       uint64_t mid = BVAL(state->smb2.hdr, SMB2_HDR_MESSAGE_ID);
+       uint64_t aid = BVAL(state->smb2.hdr, SMB2_HDR_ASYNC_ID);
+       struct smbXcli_tcon *tcon = state->tcon;
+       struct smbXcli_session *session = state->session;
+       uint8_t *fixed = state->smb2.pad;
+       uint16_t fixed_len = 4;
+       struct tevent_req *subreq;
+       struct smbXcli_req_state *substate;
+       NTSTATUS status;
+
+       SSVAL(fixed, 0, 0x04);
+       SSVAL(fixed, 2, 0);
+
+       subreq = smb2cli_req_create(state, state->ev,
+                                   state->conn,
+                                   SMB2_OP_CANCEL,
+                                   flags, 0,
+                                   0, /* timeout */
+                                   tcon, session,
+                                   fixed, fixed_len,
+                                   NULL, 0);
+       if (subreq == NULL) {
+               return false;
+       }
+       substate = tevent_req_data(subreq, struct smbXcli_req_state);
+
+       /*
+        * clear everything but the SMB2_HDR_FLAG_ASYNC flag
+        * e.g. if SMB2_HDR_FLAG_CHAINED is set we get INVALID_PARAMETER back
+        */
+       flags &= SMB2_HDR_FLAG_ASYNC;
+
+       if (flags & SMB2_HDR_FLAG_ASYNC) {
+               mid = 0;
+       }
+
+       SIVAL(substate->smb2.hdr, SMB2_HDR_FLAGS, flags);
+       SBVAL(substate->smb2.hdr, SMB2_HDR_MESSAGE_ID, mid);
+       SBVAL(substate->smb2.hdr, SMB2_HDR_ASYNC_ID, aid);
+
+       status = smb2cli_req_compound_submit(&subreq, 1);
+       if (!NT_STATUS_IS_OK(status)) {
+               TALLOC_FREE(subreq);
+               return false;
+       }
+
+       tevent_req_set_callback(subreq, smb2cli_req_cancel_done, NULL);
+
+       return true;
+}
+
+static void smb2cli_req_cancel_done(struct tevent_req *subreq)
+{
+       /* we do not care about the result */
+       TALLOC_FREE(subreq);
+}
+
 struct tevent_req *smb2cli_req_create(TALLOC_CTX *mem_ctx,
                                      struct tevent_context *ev,
                                      struct smbXcli_conn *conn,
@@ -1865,9 +2610,8 @@ struct tevent_req *smb2cli_req_create(TALLOC_CTX *mem_ctx,
                                      uint32_t additional_flags,
                                      uint32_t clear_flags,
                                      uint32_t timeout_msec,
-                                     uint32_t pid,
-                                     uint32_t tid,
-                                     uint64_t uid,
+                                     struct smbXcli_tcon *tcon,
+                                     struct smbXcli_session *session,
                                      const uint8_t *fixed,
                                      uint16_t fixed_len,
                                      const uint8_t *dyn,
@@ -1876,6 +2620,10 @@ struct tevent_req *smb2cli_req_create(TALLOC_CTX *mem_ctx,
        struct tevent_req *req;
        struct smbXcli_req_state *state;
        uint32_t flags = 0;
+       uint32_t tid = 0;
+       uint64_t uid = 0;
+       bool use_channel_sequence = false;
+       uint16_t channel_sequence = 0;
 
        req = tevent_req_create(mem_ctx, &state,
                                struct smbXcli_req_state);
@@ -1885,6 +2633,47 @@ struct tevent_req *smb2cli_req_create(TALLOC_CTX *mem_ctx,
 
        state->ev = ev;
        state->conn = conn;
+       state->session = session;
+       state->tcon = tcon;
+
+       if (conn->smb2.server.capabilities & SMB2_CAP_PERSISTENT_HANDLES) {
+               use_channel_sequence = true;
+       } else if (conn->smb2.server.capabilities & SMB2_CAP_MULTI_CHANNEL) {
+               use_channel_sequence = true;
+       }
+
+       if (session) {
+               uid = session->smb2->session_id;
+
+               if (use_channel_sequence) {
+                       channel_sequence = session->smb2->channel_sequence;
+               }
+
+               state->smb2.should_sign = session->smb2->should_sign;
+               state->smb2.should_encrypt = session->smb2->should_encrypt;
+
+               if (cmd == SMB2_OP_SESSSETUP &&
+                   session->smb2->signing_key.length != 0) {
+                       state->smb2.should_sign = true;
+               }
+
+               if (cmd == SMB2_OP_SESSSETUP &&
+                   session->smb2_channel.signing_key.length == 0) {
+                       state->smb2.should_encrypt = false;
+               }
+       }
+
+       if (tcon) {
+               tid = tcon->smb2.tcon_id;
+
+               if (tcon->smb2.should_encrypt) {
+                       state->smb2.should_encrypt = true;
+               }
+       }
+
+       if (state->smb2.should_encrypt) {
+               state->smb2.should_sign = false;
+       }
 
        state->smb2.recv_iov = talloc_zero_array(state, struct iovec, 3);
        if (state->smb2.recv_iov == NULL) {
@@ -1900,14 +2689,17 @@ struct tevent_req *smb2cli_req_create(TALLOC_CTX *mem_ctx,
        state->smb2.dyn = dyn;
        state->smb2.dyn_len = dyn_len;
 
+       if (state->smb2.should_encrypt) {
+               SIVAL(state->smb2.transform, SMB2_TF_PROTOCOL_ID, SMB2_TF_MAGIC);
+               SBVAL(state->smb2.transform, SMB2_TF_SESSION_ID, uid);
+       }
+
        SIVAL(state->smb2.hdr, SMB2_HDR_PROTOCOL_ID,    SMB2_MAGIC);
        SSVAL(state->smb2.hdr, SMB2_HDR_LENGTH,         SMB2_HDR_BODY);
-       SSVAL(state->smb2.hdr, SMB2_HDR_CREDIT_CHARGE,  1);
-       SIVAL(state->smb2.hdr, SMB2_HDR_STATUS,         NT_STATUS_V(NT_STATUS_OK));
        SSVAL(state->smb2.hdr, SMB2_HDR_OPCODE,         cmd);
-       SSVAL(state->smb2.hdr, SMB2_HDR_CREDIT,         31);
+       SSVAL(state->smb2.hdr, SMB2_HDR_CHANNEL_SEQUENCE, channel_sequence);
        SIVAL(state->smb2.hdr, SMB2_HDR_FLAGS,          flags);
-       SIVAL(state->smb2.hdr, SMB2_HDR_PID,            pid);
+       SIVAL(state->smb2.hdr, SMB2_HDR_PID,            0); /* reserved */
        SIVAL(state->smb2.hdr, SMB2_HDR_TID,            tid);
        SBVAL(state->smb2.hdr, SMB2_HDR_SESSION_ID,     uid);
 
@@ -1938,7 +2730,16 @@ struct tevent_req *smb2cli_req_create(TALLOC_CTX *mem_ctx,
        return req;
 }
 
-static void smb2cli_writev_done(struct tevent_req *subreq);
+void smb2cli_req_set_notify_async(struct tevent_req *req)
+{
+       struct smbXcli_req_state *state =
+               tevent_req_data(req,
+               struct smbXcli_req_state);
+
+       state->smb2.notify_async = true;
+}
+
+static void smb2cli_req_writev_done(struct tevent_req *subreq);
 static NTSTATUS smb2cli_conn_dispatch_incoming(struct smbXcli_conn *conn,
                                               TALLOC_CTX *tmp_mem,
                                               uint8_t *inbuf);
@@ -1950,14 +2751,17 @@ NTSTATUS smb2cli_req_compound_submit(struct tevent_req **reqs,
        struct tevent_req *subreq;
        struct iovec *iov;
        int i, num_iov, nbt_len;
+       int tf_iov = -1;
+       const DATA_BLOB *encryption_key = NULL;
+       uint64_t encryption_session_id = 0;
 
        /*
-        * 1 for the nbt length
+        * 1 for the nbt length, optional TRANSFORM
         * per request: HDR, fixed, dyn, padding
         * -1 because the last one does not need padding
         */
 
-       iov = talloc_array(reqs[0], struct iovec, 1 + 4*num_reqs - 1);
+       iov = talloc_array(reqs[0], struct iovec, 1 + 1 + 4*num_reqs - 1);
        if (iov == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -1965,10 +2769,74 @@ NTSTATUS smb2cli_req_compound_submit(struct tevent_req **reqs,
        num_iov = 1;
        nbt_len = 0;
 
+       /*
+        * the session of the first request that requires encryption
+        * specifies the encryption key.
+        */
+       for (i=0; i<num_reqs; i++) {
+               if (!tevent_req_is_in_progress(reqs[i])) {
+                       return NT_STATUS_INTERNAL_ERROR;
+               }
+
+               state = tevent_req_data(reqs[i], struct smbXcli_req_state);
+
+               if (!smbXcli_conn_is_connected(state->conn)) {
+                       return NT_STATUS_CONNECTION_DISCONNECTED;
+               }
+
+               if ((state->conn->protocol != PROTOCOL_NONE) &&
+                   (state->conn->protocol < PROTOCOL_SMB2_02)) {
+                       return NT_STATUS_REVISION_MISMATCH;
+               }
+
+               if (state->session == NULL) {
+                       continue;
+               }
+
+               if (!state->smb2.should_encrypt) {
+                       continue;
+               }
+
+               encryption_key = &state->session->smb2->encryption_key;
+               if (encryption_key->length == 0) {
+                       return NT_STATUS_INVALID_PARAMETER_MIX;
+               }
+
+               encryption_session_id = state->session->smb2->session_id;
+
+               tf_iov = num_iov;
+               iov[num_iov].iov_base = state->smb2.transform;
+               iov[num_iov].iov_len  = sizeof(state->smb2.transform);
+               num_iov += 1;
+
+               SBVAL(state->smb2.transform, SMB2_TF_PROTOCOL_ID, SMB2_TF_MAGIC);
+               SBVAL(state->smb2.transform, SMB2_TF_NONCE,
+                     state->session->smb2->nonce_low);
+               SBVAL(state->smb2.transform, SMB2_TF_NONCE+8,
+                     state->session->smb2->nonce_high);
+               SBVAL(state->smb2.transform, SMB2_TF_SESSION_ID,
+                     encryption_session_id);
+
+               state->session->smb2->nonce_low += 1;
+               if (state->session->smb2->nonce_low == 0) {
+                       state->session->smb2->nonce_high += 1;
+                       state->session->smb2->nonce_low += 1;
+               }
+
+               nbt_len += SMB2_TF_HDR_SIZE;
+               break;
+       }
+
        for (i=0; i<num_reqs; i++) {
+               int hdr_iov;
                size_t reqlen;
                bool ret;
+               uint16_t opcode;
+               uint64_t avail;
+               uint16_t charge;
+               uint16_t credits;
                uint64_t mid;
+               const DATA_BLOB *signing_key = NULL;
 
                if (!tevent_req_is_in_progress(reqs[i])) {
                        return NT_STATUS_INTERNAL_ERROR;
@@ -1985,15 +2853,76 @@ NTSTATUS smb2cli_req_compound_submit(struct tevent_req **reqs,
                        return NT_STATUS_REVISION_MISMATCH;
                }
 
-               if (state->conn->smb2.mid == UINT64_MAX) {
+               opcode = SVAL(state->smb2.hdr, SMB2_HDR_OPCODE);
+               if (opcode == SMB2_OP_CANCEL) {
+                       goto skip_credits;
+               }
+
+               avail = UINT64_MAX - state->conn->smb2.mid;
+               if (avail < 1) {
                        return NT_STATUS_CONNECTION_ABORTED;
                }
 
+               if (state->conn->smb2.server.capabilities & SMB2_CAP_LARGE_MTU) {
+                       charge = (MAX(state->smb2.dyn_len, 1) - 1)/ 65536 + 1;
+               } else {
+                       charge = 1;
+               }
+
+               charge = MAX(state->smb2.credit_charge, charge);
+
+               avail = MIN(avail, state->conn->smb2.cur_credits);
+               if (avail < charge) {
+                       return NT_STATUS_INTERNAL_ERROR;
+               }
+
+               credits = 0;
+               if (state->conn->smb2.max_credits > state->conn->smb2.cur_credits) {
+                       credits = state->conn->smb2.max_credits -
+                                 state->conn->smb2.cur_credits;
+               }
+               if (state->conn->smb2.max_credits >= state->conn->smb2.cur_credits) {
+                       credits += 1;
+               }
+
                mid = state->conn->smb2.mid;
-               state->conn->smb2.mid += 1;
+               state->conn->smb2.mid += charge;
+               state->conn->smb2.cur_credits -= charge;
 
+               if (state->conn->smb2.server.capabilities & SMB2_CAP_LARGE_MTU) {
+                       SSVAL(state->smb2.hdr, SMB2_HDR_CREDIT_CHARGE, charge);
+               }
+               SSVAL(state->smb2.hdr, SMB2_HDR_CREDIT, credits);
                SBVAL(state->smb2.hdr, SMB2_HDR_MESSAGE_ID, mid);
 
+skip_credits:
+               if (state->session && encryption_key == NULL) {
+                       /*
+                        * We prefer the channel signing key if it is
+                        * already there.
+                        */
+                       if (state->smb2.should_sign) {
+                               signing_key = &state->session->smb2_channel.signing_key;
+                       }
+
+                       /*
+                        * If it is a channel binding, we already have the main
+                        * signing key and try that one.
+                        */
+                       if (signing_key && signing_key->length == 0) {
+                               signing_key = &state->session->smb2->signing_key;
+                       }
+
+                       /*
+                        * If we do not have any session key yet, we skip the
+                        * signing of SMB2_OP_SESSSETUP requests.
+                        */
+                       if (signing_key && signing_key->length == 0) {
+                               signing_key = NULL;
+                       }
+               }
+
+               hdr_iov = num_iov;
                iov[num_iov].iov_base = state->smb2.hdr;
                iov[num_iov].iov_len  = sizeof(state->smb2.hdr);
                num_iov += 1;
@@ -2022,6 +2951,20 @@ NTSTATUS smb2cli_req_compound_submit(struct tevent_req **reqs,
                        }
                        SIVAL(state->smb2.hdr, SMB2_HDR_NEXT_COMMAND, reqlen);
                }
+
+               state->smb2.encryption_session_id = encryption_session_id;
+
+               if (signing_key != NULL) {
+                       NTSTATUS status;
+
+                       status = smb2_signing_sign_pdu(*signing_key,
+                                                      state->session->conn->protocol,
+                                                      &iov[hdr_iov], num_iov - hdr_iov);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               return status;
+                       }
+               }
+
                nbt_len += reqlen;
 
                ret = smbXcli_req_set_pending(reqs[i]);
@@ -2030,28 +2973,69 @@ NTSTATUS smb2cli_req_compound_submit(struct tevent_req **reqs,
                }
        }
 
-       /*
-        * TODO: Do signing here
-        */
-
        state = tevent_req_data(reqs[0], struct smbXcli_req_state);
        _smb_setlen_tcp(state->length_hdr, nbt_len);
        iov[0].iov_base = state->length_hdr;
        iov[0].iov_len  = sizeof(state->length_hdr);
 
+       if (encryption_key != NULL) {
+               NTSTATUS status;
+               size_t buflen = nbt_len - SMB2_TF_HDR_SIZE;
+               uint8_t *buf;
+               int vi;
+
+               buf = talloc_array(iov, uint8_t, buflen);
+               if (buf == NULL) {
+                       return NT_STATUS_NO_MEMORY;
+               }
+
+               /*
+                * We copy the buffers before encrypting them,
+                * this is at least currently needed for the
+                * to keep state->smb2.hdr.
+                *
+                * Also the callers may expect there buffers
+                * to be const.
+                */
+               for (vi = tf_iov + 1; vi < num_iov; vi++) {
+                       struct iovec *v = &iov[vi];
+                       const uint8_t *o = (const uint8_t *)v->iov_base;
+
+                       memcpy(buf, o, v->iov_len);
+                       v->iov_base = (void *)buf;
+                       buf += v->iov_len;
+               }
+
+               status = smb2_signing_encrypt_pdu(*encryption_key,
+                                       state->conn->protocol,
+                                       &iov[tf_iov], num_iov - tf_iov);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return status;
+               }
+       }
+
        if (state->conn->dispatch_incoming == NULL) {
                state->conn->dispatch_incoming = smb2cli_conn_dispatch_incoming;
        }
 
        subreq = writev_send(state, state->ev, state->conn->outgoing,
-                            state->conn->fd, false, iov, num_iov);
+                            state->conn->write_fd, false, iov, num_iov);
        if (subreq == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
-       tevent_req_set_callback(subreq, smb2cli_writev_done, reqs[0]);
+       tevent_req_set_callback(subreq, smb2cli_req_writev_done, reqs[0]);
        return NT_STATUS_OK;
 }
 
+void smb2cli_req_set_credit_charge(struct tevent_req *req, uint16_t charge)
+{
+       struct smbXcli_req_state *state =
+               tevent_req_data(req,
+               struct smbXcli_req_state);
+
+       state->smb2.credit_charge = charge;
+}
+
 struct tevent_req *smb2cli_req_send(TALLOC_CTX *mem_ctx,
                                    struct tevent_context *ev,
                                    struct smbXcli_conn *conn,
@@ -2059,9 +3043,8 @@ struct tevent_req *smb2cli_req_send(TALLOC_CTX *mem_ctx,
                                    uint32_t additional_flags,
                                    uint32_t clear_flags,
                                    uint32_t timeout_msec,
-                                   uint32_t pid,
-                                   uint32_t tid,
-                                   uint64_t uid,
+                                   struct smbXcli_tcon *tcon,
+                                   struct smbXcli_session *session,
                                    const uint8_t *fixed,
                                    uint16_t fixed_len,
                                    const uint8_t *dyn,
@@ -2073,7 +3056,7 @@ struct tevent_req *smb2cli_req_send(TALLOC_CTX *mem_ctx,
        req = smb2cli_req_create(mem_ctx, ev, conn, cmd,
                                 additional_flags, clear_flags,
                                 timeout_msec,
-                                pid, tid, uid,
+                                tcon, session,
                                 fixed, fixed_len, dyn, dyn_len);
        if (req == NULL) {
                return NULL;
@@ -2088,7 +3071,7 @@ struct tevent_req *smb2cli_req_send(TALLOC_CTX *mem_ctx,
        return req;
 }
 
-static void smb2cli_writev_done(struct tevent_req *subreq)
+static void smb2cli_req_writev_done(struct tevent_req *subreq)
 {
        struct tevent_req *req =
                tevent_req_callback_data(subreq,
@@ -2109,26 +3092,25 @@ static void smb2cli_writev_done(struct tevent_req *subreq)
        }
 }
 
-static NTSTATUS smb2cli_inbuf_parse_compound(uint8_t *buf, TALLOC_CTX *mem_ctx,
+static NTSTATUS smb2cli_inbuf_parse_compound(struct smbXcli_conn *conn,
+                                            uint8_t *buf,
+                                            size_t buflen,
+                                            TALLOC_CTX *mem_ctx,
                                             struct iovec **piov, int *pnum_iov)
 {
        struct iovec *iov;
-       int num_iov;
-       size_t buflen;
-       size_t taken;
-       uint8_t *first_hdr;
-
-       num_iov = 0;
+       int num_iov = 0;
+       size_t taken = 0;
+       uint8_t *first_hdr = buf;
+       size_t verified_buflen = 0;
+       uint8_t *tf = NULL;
+       size_t tf_len = 0;
 
        iov = talloc_array(mem_ctx, struct iovec, num_iov);
        if (iov == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       buflen = smb_len_tcp(buf);
-       taken = 0;
-       first_hdr = buf + NBT_HDR_SIZE;
-
        while (taken < buflen) {
                size_t len = buflen - taken;
                uint8_t *hdr = first_hdr + taken;
@@ -2138,9 +3120,79 @@ static NTSTATUS smb2cli_inbuf_parse_compound(uint8_t *buf, TALLOC_CTX *mem_ctx,
                uint16_t body_size;
                struct iovec *iov_tmp;
 
-               /*
-                * We need the header plus the body length field
-                */
+               if (verified_buflen > taken) {
+                       len = verified_buflen - taken;
+               } else {
+                       tf = NULL;
+                       tf_len = 0;
+               }
+
+               if (len < 4) {
+                       DEBUG(10, ("%d bytes left, expected at least %d\n",
+                                  (int)len, 4));
+                       goto inval;
+               }
+               if (IVAL(hdr, 0) == SMB2_TF_MAGIC) {
+                       struct smbXcli_session *s;
+                       uint64_t uid;
+                       struct iovec tf_iov[2];
+                       size_t enc_len;
+                       NTSTATUS status;
+
+                       if (len < SMB2_TF_HDR_SIZE) {
+                               DEBUG(10, ("%d bytes left, expected at least %d\n",
+                                          (int)len, SMB2_TF_HDR_SIZE));
+                               goto inval;
+                       }
+                       tf = hdr;
+                       tf_len = SMB2_TF_HDR_SIZE;
+                       taken += tf_len;
+
+                       hdr = first_hdr + taken;
+                       enc_len = IVAL(tf, SMB2_TF_MSG_SIZE);
+                       uid = BVAL(tf, SMB2_TF_SESSION_ID);
+
+                       if (len < SMB2_TF_HDR_SIZE + enc_len) {
+                               DEBUG(10, ("%d bytes left, expected at least %d\n",
+                                          (int)len,
+                                          (int)(SMB2_TF_HDR_SIZE + enc_len)));
+                               goto inval;
+                       }
+
+                       s = conn->sessions;
+                       for (; s; s = s->next) {
+                               if (s->smb2->session_id != uid) {
+                                       continue;
+                               }
+                               break;
+                       }
+
+                       if (s == NULL) {
+                               DEBUG(10, ("unknown session_id %llu\n",
+                                          (unsigned long long)uid));
+                               goto inval;
+                       }
+
+                       tf_iov[0].iov_base = (void *)tf;
+                       tf_iov[0].iov_len = tf_len;
+                       tf_iov[1].iov_base = (void *)hdr;
+                       tf_iov[1].iov_len = enc_len;
+
+                       status = smb2_signing_decrypt_pdu(s->smb2->decryption_key,
+                                                         conn->protocol,
+                                                         tf_iov, 2);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               TALLOC_FREE(iov);
+                               return status;
+                       }
+
+                       verified_buflen = taken + enc_len;
+                       len = enc_len;
+               }
+
+               /*
+                * We need the header plus the body length field
+                */
 
                if (len < SMB2_HDR_BODY + 2) {
                        DEBUG(10, ("%d bytes left, expected at least %d\n",
@@ -2181,21 +3233,23 @@ static NTSTATUS smb2cli_inbuf_parse_compound(uint8_t *buf, TALLOC_CTX *mem_ctx,
                }
 
                iov_tmp = talloc_realloc(mem_ctx, iov, struct iovec,
-                                        num_iov + 3);
+                                        num_iov + 4);
                if (iov_tmp == NULL) {
                        TALLOC_FREE(iov);
                        return NT_STATUS_NO_MEMORY;
                }
                iov = iov_tmp;
                cur = &iov[num_iov];
-               num_iov += 3;
+               num_iov += 4;
 
-               cur[0].iov_base = hdr;
-               cur[0].iov_len  = SMB2_HDR_BODY;
-               cur[1].iov_base = hdr + SMB2_HDR_BODY;
-               cur[1].iov_len  = body_size;
-               cur[2].iov_base = hdr + SMB2_HDR_BODY + body_size;
-               cur[2].iov_len  = full_size - (SMB2_HDR_BODY + body_size);
+               cur[0].iov_base = tf;
+               cur[0].iov_len  = tf_len;
+               cur[1].iov_base = hdr;
+               cur[1].iov_len  = SMB2_HDR_BODY;
+               cur[2].iov_base = hdr + SMB2_HDR_BODY;
+               cur[2].iov_len  = body_size;
+               cur[3].iov_base = hdr + SMB2_HDR_BODY + body_size;
+               cur[3].iov_len  = full_size - (SMB2_HDR_BODY + body_size);
 
                taken += full_size;
        }
@@ -2238,21 +3292,39 @@ static NTSTATUS smb2cli_conn_dispatch_incoming(struct smbXcli_conn *conn,
        int i, num_iov;
        NTSTATUS status;
        bool defer = true;
+       struct smbXcli_session *last_session = NULL;
+       size_t inbuf_len = smb_len_tcp(inbuf);
 
-       status = smb2cli_inbuf_parse_compound(inbuf, tmp_mem,
+       status = smb2cli_inbuf_parse_compound(conn,
+                                             inbuf + NBT_HDR_SIZE,
+                                             inbuf_len,
+                                             tmp_mem,
                                              &iov, &num_iov);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
 
-       for (i=0; i<num_iov; i+=3) {
+       for (i=0; i<num_iov; i+=4) {
                uint8_t *inbuf_ref = NULL;
                struct iovec *cur = &iov[i];
-               uint8_t *inhdr = (uint8_t *)cur[0].iov_base;
+               uint8_t *inhdr = (uint8_t *)cur[1].iov_base;
                uint16_t opcode = SVAL(inhdr, SMB2_HDR_OPCODE);
                uint32_t flags = IVAL(inhdr, SMB2_HDR_FLAGS);
                uint64_t mid = BVAL(inhdr, SMB2_HDR_MESSAGE_ID);
                uint16_t req_opcode;
+               uint32_t req_flags;
+               uint16_t credits = SVAL(inhdr, SMB2_HDR_CREDIT);
+               uint32_t new_credits;
+               struct smbXcli_session *session = NULL;
+               const DATA_BLOB *signing_key = NULL;
+               bool was_encrypted = false;
+
+               new_credits = conn->smb2.cur_credits;
+               new_credits += credits;
+               if (new_credits > UINT16_MAX) {
+                       return NT_STATUS_INVALID_NETWORK_RESPONSE;
+               }
+               conn->smb2.cur_credits += credits;
 
                req = smb2cli_conn_find_pending(conn, mid);
                if (req == NULL) {
@@ -2260,10 +3332,13 @@ static NTSTATUS smb2cli_conn_dispatch_incoming(struct smbXcli_conn *conn,
                }
                state = tevent_req_data(req, struct smbXcli_req_state);
 
+               state->smb2.got_async = false;
+
                req_opcode = SVAL(state->smb2.hdr, SMB2_HDR_OPCODE);
                if (opcode != req_opcode) {
                        return NT_STATUS_INVALID_NETWORK_RESPONSE;
                }
+               req_flags = SVAL(state->smb2.hdr, SMB2_HDR_FLAGS);
 
                if (!(flags & SMB2_HDR_FLAG_REDIRECT)) {
                        return NT_STATUS_INVALID_NETWORK_RESPONSE;
@@ -2272,22 +3347,214 @@ static NTSTATUS smb2cli_conn_dispatch_incoming(struct smbXcli_conn *conn,
                status = NT_STATUS(IVAL(inhdr, SMB2_HDR_STATUS));
                if ((flags & SMB2_HDR_FLAG_ASYNC) &&
                    NT_STATUS_EQUAL(status, STATUS_PENDING)) {
-                       uint32_t req_flags = IVAL(state->smb2.hdr, SMB2_HDR_FLAGS);
                        uint64_t async_id = BVAL(inhdr, SMB2_HDR_ASYNC_ID);
 
+                       /*
+                        * async interim responses are not signed,
+                        * even if the SMB2_HDR_FLAG_SIGNED flag
+                        * is set.
+                        */
                        req_flags |= SMB2_HDR_FLAG_ASYNC;
                        SBVAL(state->smb2.hdr, SMB2_HDR_FLAGS, req_flags);
                        SBVAL(state->smb2.hdr, SMB2_HDR_ASYNC_ID, async_id);
+
+                       if (state->smb2.notify_async) {
+                               state->smb2.got_async = true;
+                               tevent_req_defer_callback(req, state->ev);
+                               tevent_req_notify_callback(req);
+                       }
                        continue;
                }
 
+               session = state->session;
+               if (req_flags & SMB2_HDR_FLAG_CHAINED) {
+                       session = last_session;
+               }
+               last_session = session;
+
+               if (state->smb2.should_sign) {
+                       if (!(flags & SMB2_HDR_FLAG_SIGNED)) {
+                               return NT_STATUS_ACCESS_DENIED;
+                       }
+               }
+
+               if (flags & SMB2_HDR_FLAG_SIGNED) {
+                       uint64_t uid = BVAL(inhdr, SMB2_HDR_SESSION_ID);
+
+                       if (session == NULL) {
+                               struct smbXcli_session *s;
+
+                               s = state->conn->sessions;
+                               for (; s; s = s->next) {
+                                       if (s->smb2->session_id != uid) {
+                                               continue;
+                                       }
+
+                                       session = s;
+                                       break;
+                               }
+                       }
+
+                       if (session == NULL) {
+                               return NT_STATUS_INVALID_NETWORK_RESPONSE;
+                       }
+
+                       last_session = session;
+                       signing_key = &session->smb2_channel.signing_key;
+               }
+
+               if (opcode == SMB2_OP_SESSSETUP) {
+                       /*
+                        * We prefer the channel signing key, if it is
+                        * already there.
+                        *
+                        * If we do not have a channel signing key yet,
+                        * we try the main signing key, if it is not
+                        * the final response.
+                        */
+                       if (signing_key && signing_key->length == 0 &&
+                           !NT_STATUS_IS_OK(status)) {
+                               signing_key = &session->smb2->signing_key;
+                       }
+
+                       if (signing_key && signing_key->length == 0) {
+                               /*
+                                * If we do not have a session key to
+                                * verify the signature, we defer the
+                                * signing check to the caller.
+                                *
+                                * The caller gets NT_STATUS_OK, it
+                                * has to call
+                                * smb2cli_session_set_session_key()
+                                * or
+                                * smb2cli_session_set_channel_key()
+                                * which will check the signature
+                                * with the channel signing key.
+                                */
+                               signing_key = NULL;
+                       }
+               }
+
+               if (cur[0].iov_len == SMB2_TF_HDR_SIZE) {
+                       const uint8_t *tf = (const uint8_t *)cur[0].iov_base;
+                       uint64_t uid = BVAL(tf, SMB2_TF_SESSION_ID);
+
+                       /*
+                        * If the response was encrypted in a SMB2_TRANSFORM
+                        * pdu, which belongs to the correct session,
+                        * we do not need to do signing checks
+                        *
+                        * It could be the session the response belongs to
+                        * or the session that was used to encrypt the
+                        * SMB2_TRANSFORM request.
+                        */
+                       if ((session && session->smb2->session_id == uid) ||
+                           (state->smb2.encryption_session_id == uid)) {
+                               signing_key = NULL;
+                               was_encrypted = true;
+                       }
+               }
+
+               if (NT_STATUS_EQUAL(status, NT_STATUS_USER_SESSION_DELETED)) {
+                       /*
+                        * if the server returns NT_STATUS_USER_SESSION_DELETED
+                        * the response is not signed and we should
+                        * propagate the NT_STATUS_USER_SESSION_DELETED
+                        * status to the caller.
+                        */
+                       state->smb2.signing_skipped = true;
+                       signing_key = NULL;
+               }
+
+               if (NT_STATUS_EQUAL(status, NT_STATUS_INVALID_PARAMETER)) {
+                       /*
+                        * if the server returns
+                        * NT_STATUS_INVALID_PARAMETER
+                        * the response might not be encrypted.
+                        */
+                       if (state->smb2.should_encrypt && !was_encrypted) {
+                               state->smb2.signing_skipped = true;
+                               signing_key = NULL;
+                       }
+               }
+
+               if (state->smb2.should_encrypt && !was_encrypted) {
+                       if (!state->smb2.signing_skipped) {
+                               return NT_STATUS_ACCESS_DENIED;
+                       }
+               }
+
+               if (NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_NAME_DELETED) ||
+                   NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED) ||
+                   NT_STATUS_EQUAL(status, NT_STATUS_INVALID_PARAMETER)) {
+                       /*
+                        * if the server returns
+                        * NT_STATUS_NETWORK_NAME_DELETED
+                        * NT_STATUS_FILE_CLOSED
+                        * NT_STATUS_INVALID_PARAMETER
+                        * the response might not be signed
+                        * as this happens before the signing checks.
+                        *
+                        * If server echos the signature (or all zeros)
+                        * we should report the status from the server
+                        * to the caller.
+                        */
+                       if (signing_key) {
+                               int cmp;
+
+                               cmp = memcmp(inhdr+SMB2_HDR_SIGNATURE,
+                                            state->smb2.hdr+SMB2_HDR_SIGNATURE,
+                                            16);
+                               if (cmp == 0) {
+                                       state->smb2.signing_skipped = true;
+                                       signing_key = NULL;
+                               }
+                       }
+                       if (signing_key) {
+                               int cmp;
+                               static const uint8_t zeros[16];
+
+                               cmp = memcmp(inhdr+SMB2_HDR_SIGNATURE,
+                                            zeros,
+                                            16);
+                               if (cmp == 0) {
+                                       state->smb2.signing_skipped = true;
+                                       signing_key = NULL;
+                               }
+                       }
+               }
+
+               if (signing_key) {
+                       status = smb2_signing_check_pdu(*signing_key,
+                                                       state->conn->protocol,
+                                                       &cur[1], 3);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               /*
+                                * If the signing check fails, we disconnect
+                                * the connection.
+                                */
+                               return status;
+                       }
+               }
+
+               if (NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_SESSION_EXPIRED) &&
+                   (session != NULL) && session->disconnect_expired)
+               {
+                       /*
+                        * this should be a short term hack
+                        * until the upper layers have implemented
+                        * re-authentication.
+                        */
+                       return status;
+               }
+
                smbXcli_req_unset_pending(req);
 
                /*
                 * There might be more than one response
                 * we need to defer the notifications
                 */
-               if ((num_iov == 4) && (talloc_array_length(conn->pending) == 0)) {
+               if ((num_iov == 5) && (talloc_array_length(conn->pending) == 0)) {
                        defer = false;
                }
 
@@ -2305,9 +3572,9 @@ static NTSTATUS smb2cli_conn_dispatch_incoming(struct smbXcli_conn *conn,
                }
 
                /* copy the related buffers */
-               state->smb2.recv_iov[0] = cur[0];
-               state->smb2.recv_iov[1] = cur[1];
-               state->smb2.recv_iov[2] = cur[2];
+               state->smb2.recv_iov[0] = cur[1];
+               state->smb2.recv_iov[1] = cur[2];
+               state->smb2.recv_iov[2] = cur[3];
 
                tevent_req_done(req);
        }
@@ -2337,6 +3604,10 @@ NTSTATUS smb2cli_req_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
                *piov = NULL;
        }
 
+       if (state->smb2.got_async) {
+               return STATUS_PENDING;
+       }
+
        if (tevent_req_is_nterror(req, &status)) {
                for (i=0; i < num_expected; i++) {
                        if (NT_STATUS_EQUAL(status, expected[i].status)) {
@@ -2381,6 +3652,15 @@ NTSTATUS smb2cli_req_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
                return status;
        }
 
+       if (state->smb2.signing_skipped) {
+               if (num_expected > 0) {
+                       return NT_STATUS_ACCESS_DENIED;
+               }
+               if (!NT_STATUS_IS_ERR(status)) {
+                       return NT_STATUS_ACCESS_DENIED;
+               }
+       }
+
        if (!found_size) {
                return NT_STATUS_INVALID_NETWORK_RESPONSE;
        }
@@ -2391,3 +3671,1383 @@ NTSTATUS smb2cli_req_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
 
        return status;
 }
+
+static const struct {
+       enum protocol_types proto;
+       const char *smb1_name;
+} smb1cli_prots[] = {
+       {PROTOCOL_CORE,         "PC NETWORK PROGRAM 1.0"},
+       {PROTOCOL_COREPLUS,     "MICROSOFT NETWORKS 1.03"},
+       {PROTOCOL_LANMAN1,      "MICROSOFT NETWORKS 3.0"},
+       {PROTOCOL_LANMAN1,      "LANMAN1.0"},
+       {PROTOCOL_LANMAN2,      "LM1.2X002"},
+       {PROTOCOL_LANMAN2,      "DOS LANMAN2.1"},
+       {PROTOCOL_LANMAN2,      "LANMAN2.1"},
+       {PROTOCOL_LANMAN2,      "Samba"},
+       {PROTOCOL_NT1,          "NT LANMAN 1.0"},
+       {PROTOCOL_NT1,          "NT LM 0.12"},
+       {PROTOCOL_SMB2_02,      "SMB 2.002"},
+       {PROTOCOL_SMB2_10,      "SMB 2.???"},
+};
+
+static const struct {
+       enum protocol_types proto;
+       uint16_t smb2_dialect;
+} smb2cli_prots[] = {
+       {PROTOCOL_SMB2_02,      SMB2_DIALECT_REVISION_202},
+       {PROTOCOL_SMB2_10,      SMB2_DIALECT_REVISION_210},
+       {PROTOCOL_SMB2_22,      SMB2_DIALECT_REVISION_222},
+       {PROTOCOL_SMB2_24,      SMB2_DIALECT_REVISION_224},
+       {PROTOCOL_SMB3_00,      SMB3_DIALECT_REVISION_300},
+};
+
+struct smbXcli_negprot_state {
+       struct smbXcli_conn *conn;
+       struct tevent_context *ev;
+       uint32_t timeout_msec;
+       enum protocol_types min_protocol;
+       enum protocol_types max_protocol;
+
+       struct {
+               uint8_t fixed[36];
+               uint8_t dyn[ARRAY_SIZE(smb2cli_prots)*2];
+       } smb2;
+};
+
+static void smbXcli_negprot_invalid_done(struct tevent_req *subreq);
+static struct tevent_req *smbXcli_negprot_smb1_subreq(struct smbXcli_negprot_state *state);
+static void smbXcli_negprot_smb1_done(struct tevent_req *subreq);
+static struct tevent_req *smbXcli_negprot_smb2_subreq(struct smbXcli_negprot_state *state);
+static void smbXcli_negprot_smb2_done(struct tevent_req *subreq);
+static NTSTATUS smbXcli_negprot_dispatch_incoming(struct smbXcli_conn *conn,
+                                                 TALLOC_CTX *frame,
+                                                 uint8_t *inbuf);
+
+struct tevent_req *smbXcli_negprot_send(TALLOC_CTX *mem_ctx,
+                                       struct tevent_context *ev,
+                                       struct smbXcli_conn *conn,
+                                       uint32_t timeout_msec,
+                                       enum protocol_types min_protocol,
+                                       enum protocol_types max_protocol)
+{
+       struct tevent_req *req, *subreq;
+       struct smbXcli_negprot_state *state;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct smbXcli_negprot_state);
+       if (req == NULL) {
+               return NULL;
+       }
+       state->conn = conn;
+       state->ev = ev;
+       state->timeout_msec = timeout_msec;
+       state->min_protocol = min_protocol;
+       state->max_protocol = max_protocol;
+
+       if (min_protocol == PROTOCOL_NONE) {
+               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER_MIX);
+               return tevent_req_post(req, ev);
+       }
+
+       if (max_protocol == PROTOCOL_NONE) {
+               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER_MIX);
+               return tevent_req_post(req, ev);
+       }
+
+       if (min_protocol > max_protocol) {
+               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER_MIX);
+               return tevent_req_post(req, ev);
+       }
+
+       if ((min_protocol < PROTOCOL_SMB2_02) &&
+           (max_protocol < PROTOCOL_SMB2_02)) {
+               /*
+                * SMB1 only...
+                */
+               conn->dispatch_incoming = smb1cli_conn_dispatch_incoming;
+
+               subreq = smbXcli_negprot_smb1_subreq(state);
+               if (tevent_req_nomem(subreq, req)) {
+                       return tevent_req_post(req, ev);
+               }
+               tevent_req_set_callback(subreq, smbXcli_negprot_smb1_done, req);
+               return req;
+       }
+
+       if ((min_protocol >= PROTOCOL_SMB2_02) &&
+           (max_protocol >= PROTOCOL_SMB2_02)) {
+               /*
+                * SMB2 only...
+                */
+               conn->dispatch_incoming = smb2cli_conn_dispatch_incoming;
+
+               subreq = smbXcli_negprot_smb2_subreq(state);
+               if (tevent_req_nomem(subreq, req)) {
+                       return tevent_req_post(req, ev);
+               }
+               tevent_req_set_callback(subreq, smbXcli_negprot_smb2_done, req);
+               return req;
+       }
+
+       /*
+        * We send an SMB1 negprot with the SMB2 dialects
+        * and expect a SMB1 or a SMB2 response.
+        *
+        * smbXcli_negprot_dispatch_incoming() will fix the
+        * callback to match protocol of the response.
+        */
+       conn->dispatch_incoming = smbXcli_negprot_dispatch_incoming;
+
+       subreq = smbXcli_negprot_smb1_subreq(state);
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
+       }
+       tevent_req_set_callback(subreq, smbXcli_negprot_invalid_done, req);
+       return req;
+}
+
+static void smbXcli_negprot_invalid_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req =
+               tevent_req_callback_data(subreq,
+               struct tevent_req);
+       NTSTATUS status;
+
+       /*
+        * we just want the low level error
+        */
+       status = tevent_req_simple_recv_ntstatus(subreq);
+       TALLOC_FREE(subreq);
+       if (tevent_req_nterror(req, status)) {
+               return;
+       }
+
+       /* this should never happen */
+       tevent_req_nterror(req, NT_STATUS_INTERNAL_ERROR);
+}
+
+static struct tevent_req *smbXcli_negprot_smb1_subreq(struct smbXcli_negprot_state *state)
+{
+       size_t i;
+       DATA_BLOB bytes = data_blob_null;
+       uint8_t flags;
+       uint16_t flags2;
+
+       /* setup the protocol strings */
+       for (i=0; i < ARRAY_SIZE(smb1cli_prots); i++) {
+               uint8_t c = 2;
+               bool ok;
+
+               if (smb1cli_prots[i].proto < state->min_protocol) {
+                       continue;
+               }
+
+               if (smb1cli_prots[i].proto > state->max_protocol) {
+                       continue;
+               }
+
+               ok = data_blob_append(state, &bytes, &c, sizeof(c));
+               if (!ok) {
+                       return NULL;
+               }
+
+               /*
+                * We now it is already ascii and
+                * we want NULL termination.
+                */
+               ok = data_blob_append(state, &bytes,
+                                     smb1cli_prots[i].smb1_name,
+                                     strlen(smb1cli_prots[i].smb1_name)+1);
+               if (!ok) {
+                       return NULL;
+               }
+       }
+
+       smb1cli_req_flags(state->max_protocol,
+                         state->conn->smb1.client.capabilities,
+                         SMBnegprot,
+                         0, 0, &flags,
+                         0, 0, &flags2);
+
+       return smb1cli_req_send(state, state->ev, state->conn,
+                               SMBnegprot,
+                               flags, ~flags,
+                               flags2, ~flags2,
+                               state->timeout_msec,
+                               0xFFFE, 0, NULL, /* pid, tid, session */
+                               0, NULL, /* wct, vwv */
+                               bytes.length, bytes.data);
+}
+
+static void smbXcli_negprot_smb1_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req =
+               tevent_req_callback_data(subreq,
+               struct tevent_req);
+       struct smbXcli_negprot_state *state =
+               tevent_req_data(req,
+               struct smbXcli_negprot_state);
+       struct smbXcli_conn *conn = state->conn;
+       struct iovec *recv_iov = NULL;
+       uint8_t *inhdr;
+       uint8_t wct;
+       uint16_t *vwv;
+       uint32_t num_bytes;
+       uint8_t *bytes;
+       NTSTATUS status;
+       uint16_t protnum;
+       size_t i;
+       size_t num_prots = 0;
+       uint8_t flags;
+       uint32_t client_capabilities = conn->smb1.client.capabilities;
+       uint32_t both_capabilities;
+       uint32_t server_capabilities = 0;
+       uint32_t capabilities;
+       uint32_t client_max_xmit = conn->smb1.client.max_xmit;
+       uint32_t server_max_xmit = 0;
+       uint32_t max_xmit;
+       uint32_t server_max_mux = 0;
+       uint16_t server_security_mode = 0;
+       uint32_t server_session_key = 0;
+       bool server_readbraw = false;
+       bool server_writebraw = false;
+       bool server_lockread = false;
+       bool server_writeunlock = false;
+       struct GUID server_guid = GUID_zero();
+       DATA_BLOB server_gss_blob = data_blob_null;
+       uint8_t server_challenge[8];
+       char *server_workgroup = NULL;
+       char *server_name = NULL;
+       int server_time_zone = 0;
+       NTTIME server_system_time = 0;
+       static const struct smb1cli_req_expected_response expected[] = {
+       {
+               .status = NT_STATUS_OK,
+               .wct = 0x11, /* NT1 */
+       },
+       {
+               .status = NT_STATUS_OK,
+               .wct = 0x0D, /* LM */
+       },
+       {
+               .status = NT_STATUS_OK,
+               .wct = 0x01, /* CORE */
+       }
+       };
+
+       ZERO_STRUCT(server_challenge);
+
+       status = smb1cli_req_recv(subreq, state,
+                                 &recv_iov,
+                                 &inhdr,
+                                 &wct,
+                                 &vwv,
+                                 NULL, /* pvwv_offset */
+                                 &num_bytes,
+                                 &bytes,
+                                 NULL, /* pbytes_offset */
+                                 NULL, /* pinbuf */
+                                 expected, ARRAY_SIZE(expected));
+       TALLOC_FREE(subreq);
+       if (tevent_req_nterror(req, status)) {
+               return;
+       }
+
+       flags = CVAL(inhdr, HDR_FLG);
+
+       protnum = SVAL(vwv, 0);
+
+       for (i=0; i < ARRAY_SIZE(smb1cli_prots); i++) {
+               if (smb1cli_prots[i].proto < state->min_protocol) {
+                       continue;
+               }
+
+               if (smb1cli_prots[i].proto > state->max_protocol) {
+                       continue;
+               }
+
+               if (protnum != num_prots) {
+                       num_prots++;
+                       continue;
+               }
+
+               conn->protocol = smb1cli_prots[i].proto;
+               break;
+       }
+
+       if (conn->protocol == PROTOCOL_NONE) {
+               tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+               return;
+       }
+
+       if ((conn->protocol < PROTOCOL_NT1) && conn->mandatory_signing) {
+               DEBUG(0,("smbXcli_negprot: SMB signing is mandatory "
+                        "and the selected protocol level doesn't support it.\n"));
+               tevent_req_nterror(req, NT_STATUS_ACCESS_DENIED);
+               return;
+       }
+
+       if (flags & FLAG_SUPPORT_LOCKREAD) {
+               server_lockread = true;
+               server_writeunlock = true;
+       }
+
+       if (conn->protocol >= PROTOCOL_NT1) {
+               const char *client_signing = NULL;
+               bool server_mandatory = false;
+               bool server_allowed = false;
+               const char *server_signing = NULL;
+               bool ok;
+               uint8_t key_len;
+
+               if (wct != 0x11) {
+                       tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+                       return;
+               }
+
+               /* NT protocol */
+               server_security_mode = CVAL(vwv + 1, 0);
+               server_max_mux = SVAL(vwv + 1, 1);
+               server_max_xmit = IVAL(vwv + 3, 1);
+               server_session_key = IVAL(vwv + 7, 1);
+               server_time_zone = SVALS(vwv + 15, 1);
+               server_time_zone *= 60;
+               /* this time arrives in real GMT */
+               server_system_time = BVAL(vwv + 11, 1);
+               server_capabilities = IVAL(vwv + 9, 1);
+
+               key_len = CVAL(vwv + 16, 1);
+
+               if (server_capabilities & CAP_RAW_MODE) {
+                       server_readbraw = true;
+                       server_writebraw = true;
+               }
+               if (server_capabilities & CAP_LOCK_AND_READ) {
+                       server_lockread = true;
+               }
+
+               if (server_capabilities & CAP_EXTENDED_SECURITY) {
+                       DATA_BLOB blob1, blob2;
+
+                       if (num_bytes < 16) {
+                               tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+                               return;
+                       }
+
+                       blob1 = data_blob_const(bytes, 16);
+                       status = GUID_from_data_blob(&blob1, &server_guid);
+                       if (tevent_req_nterror(req, status)) {
+                               return;
+                       }
+
+                       blob1 = data_blob_const(bytes+16, num_bytes-16);
+                       blob2 = data_blob_dup_talloc(state, blob1);
+                       if (blob1.length > 0 &&
+                           tevent_req_nomem(blob2.data, req)) {
+                               return;
+                       }
+                       server_gss_blob = blob2;
+               } else {
+                       DATA_BLOB blob1, blob2;
+
+                       if (num_bytes < key_len) {
+                               tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+                               return;
+                       }
+
+                       if (key_len != 0 && key_len != 8) {
+                               tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+                               return;
+                       }
+
+                       if (key_len == 8) {
+                               memcpy(server_challenge, bytes, 8);
+                       }
+
+                       blob1 = data_blob_const(bytes+key_len, num_bytes-key_len);
+                       blob2 = data_blob_const(bytes+key_len, num_bytes-key_len);
+                       if (blob1.length > 0) {
+                               size_t len;
+
+                               len = utf16_len_n(blob1.data,
+                                                 blob1.length);
+                               blob1.length = len;
+
+                               ok = convert_string_talloc(state,
+                                                          CH_UTF16LE,
+                                                          CH_UNIX,
+                                                          blob1.data,
+                                                          blob1.length,
+                                                          &server_workgroup,
+                                                          &len);
+                               if (!ok) {
+                                       status = map_nt_error_from_unix_common(errno);
+                                       tevent_req_nterror(req, status);
+                                       return;
+                               }
+                       }
+
+                       blob2.data += blob1.length;
+                       blob2.length -= blob1.length;
+                       if (blob2.length > 0) {
+                               size_t len;
+
+                               len = utf16_len_n(blob1.data,
+                                                 blob1.length);
+                               blob1.length = len;
+
+                               ok = convert_string_talloc(state,
+                                                          CH_UTF16LE,
+                                                          CH_UNIX,
+                                                          blob2.data,
+                                                          blob2.length,
+                                                          &server_name,
+                                                          &len);
+                               if (!ok) {
+                                       status = map_nt_error_from_unix_common(errno);
+                                       tevent_req_nterror(req, status);
+                                       return;
+                               }
+                       }
+               }
+
+               client_signing = "disabled";
+               if (conn->allow_signing) {
+                       client_signing = "allowed";
+               }
+               if (conn->mandatory_signing) {
+                       client_signing = "required";
+               }
+
+               server_signing = "not supported";
+               if (server_security_mode & NEGOTIATE_SECURITY_SIGNATURES_ENABLED) {
+                       server_signing = "supported";
+                       server_allowed = true;
+               } else if (conn->mandatory_signing) {
+                       /*
+                        * We have mandatory signing as client
+                        * lets assume the server will look at our
+                        * FLAGS2_SMB_SECURITY_SIGNATURES_REQUIRED
+                        * flag in the session setup
+                        */
+                       server_signing = "not announced";
+                       server_allowed = true;
+               }
+               if (server_security_mode & NEGOTIATE_SECURITY_SIGNATURES_REQUIRED) {
+                       server_signing = "required";
+                       server_mandatory = true;
+               }
+
+               ok = smb_signing_set_negotiated(conn->smb1.signing,
+                                               server_allowed,
+                                               server_mandatory);
+               if (!ok) {
+                       DEBUG(1,("cli_negprot: SMB signing is required, "
+                                "but client[%s] and server[%s] mismatch\n",
+                                client_signing, server_signing));
+                       tevent_req_nterror(req, NT_STATUS_ACCESS_DENIED);
+                       return;
+               }
+
+       } else if (conn->protocol >= PROTOCOL_LANMAN1) {
+               DATA_BLOB blob1;
+               uint8_t key_len;
+               time_t t;
+
+               if (wct != 0x0D) {
+                       tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+                       return;
+               }
+
+               server_security_mode = SVAL(vwv + 1, 0);
+               server_max_xmit = SVAL(vwv + 2, 0);
+               server_max_mux = SVAL(vwv + 3, 0);
+               server_readbraw = ((SVAL(vwv + 5, 0) & 0x1) != 0);
+               server_writebraw = ((SVAL(vwv + 5, 0) & 0x2) != 0);
+               server_session_key = IVAL(vwv + 6, 0);
+               server_time_zone = SVALS(vwv + 10, 0);
+               server_time_zone *= 60;
+               /* this time is converted to GMT by make_unix_date */
+               t = pull_dos_date((const uint8_t *)(vwv + 8), server_time_zone);
+               unix_to_nt_time(&server_system_time, t);
+               key_len = SVAL(vwv + 11, 0);
+
+               if (num_bytes < key_len) {
+                       tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+                       return;
+               }
+
+               if (key_len != 0 && key_len != 8) {
+                       tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+                       return;
+               }
+
+               if (key_len == 8) {
+                       memcpy(server_challenge, bytes, 8);
+               }
+
+               blob1 = data_blob_const(bytes+key_len, num_bytes-key_len);
+               if (blob1.length > 0) {
+                       size_t len;
+                       bool ok;
+
+                       len = utf16_len_n(blob1.data,
+                                         blob1.length);
+                       blob1.length = len;
+
+                       ok = convert_string_talloc(state,
+                                                  CH_DOS,
+                                                  CH_UNIX,
+                                                  blob1.data,
+                                                  blob1.length,
+                                                  &server_workgroup,
+                                                  &len);
+                       if (!ok) {
+                               status = map_nt_error_from_unix_common(errno);
+                               tevent_req_nterror(req, status);
+                               return;
+                       }
+               }
+
+       } else {
+               /* the old core protocol */
+               server_time_zone = get_time_zone(time(NULL));
+               server_max_xmit = 1024;
+               server_max_mux = 1;
+       }
+
+       if (server_max_xmit < 1024) {
+               tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+               return;
+       }
+
+       if (server_max_mux < 1) {
+               tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+               return;
+       }
+
+       /*
+        * Now calculate the negotiated capabilities
+        * based on the mask for:
+        * - client only flags
+        * - flags used in both directions
+        * - server only flags
+        */
+       both_capabilities = client_capabilities & server_capabilities;
+       capabilities = client_capabilities & SMB_CAP_CLIENT_MASK;
+       capabilities |= both_capabilities & SMB_CAP_BOTH_MASK;
+       capabilities |= server_capabilities & SMB_CAP_SERVER_MASK;
+
+       max_xmit = MIN(client_max_xmit, server_max_xmit);
+
+       conn->smb1.server.capabilities = server_capabilities;
+       conn->smb1.capabilities = capabilities;
+
+       conn->smb1.server.max_xmit = server_max_xmit;
+       conn->smb1.max_xmit = max_xmit;
+
+       conn->smb1.server.max_mux = server_max_mux;
+
+       conn->smb1.server.security_mode = server_security_mode;
+
+       conn->smb1.server.readbraw = server_readbraw;
+       conn->smb1.server.writebraw = server_writebraw;
+       conn->smb1.server.lockread = server_lockread;
+       conn->smb1.server.writeunlock = server_writeunlock;
+
+       conn->smb1.server.session_key = server_session_key;
+
+       talloc_steal(conn, server_gss_blob.data);
+       conn->smb1.server.gss_blob = server_gss_blob;
+       conn->smb1.server.guid = server_guid;
+       memcpy(conn->smb1.server.challenge, server_challenge, 8);
+       conn->smb1.server.workgroup = talloc_move(conn, &server_workgroup);
+       conn->smb1.server.name = talloc_move(conn, &server_name);
+
+       conn->smb1.server.time_zone = server_time_zone;
+       conn->smb1.server.system_time = server_system_time;
+
+       tevent_req_done(req);
+}
+
+static struct tevent_req *smbXcli_negprot_smb2_subreq(struct smbXcli_negprot_state *state)
+{
+       size_t i;
+       uint8_t *buf;
+       uint16_t dialect_count = 0;
+
+       buf = state->smb2.dyn;
+       for (i=0; i < ARRAY_SIZE(smb2cli_prots); i++) {
+               if (smb2cli_prots[i].proto < state->min_protocol) {
+                       continue;
+               }
+
+               if (smb2cli_prots[i].proto > state->max_protocol) {
+                       continue;
+               }
+
+               SSVAL(buf, dialect_count*2, smb2cli_prots[i].smb2_dialect);
+               dialect_count++;
+       }
+
+       buf = state->smb2.fixed;
+       SSVAL(buf, 0, 36);
+       SSVAL(buf, 2, dialect_count);
+       SSVAL(buf, 4, state->conn->smb2.client.security_mode);
+       SSVAL(buf, 6, 0);       /* Reserved */
+       if (state->max_protocol >= PROTOCOL_SMB2_22) {
+               SIVAL(buf, 8, state->conn->smb2.client.capabilities);
+       } else {
+               SIVAL(buf, 8, 0);       /* Capabilities */
+       }
+       if (state->max_protocol >= PROTOCOL_SMB2_10) {
+               NTSTATUS status;
+               DATA_BLOB blob;
+
+               status = GUID_to_ndr_blob(&state->conn->smb2.client.guid,
+                                         state, &blob);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return NULL;
+               }
+               memcpy(buf+12, blob.data, 16); /* ClientGuid */
+       } else {
+               memset(buf+12, 0, 16);  /* ClientGuid */
+       }
+       SBVAL(buf, 28, 0);      /* ClientStartTime */
+
+       return smb2cli_req_send(state, state->ev,
+                               state->conn, SMB2_OP_NEGPROT,
+                               0, 0, /* flags */
+                               state->timeout_msec,
+                               NULL, NULL, /* tcon, session */
+                               state->smb2.fixed, sizeof(state->smb2.fixed),
+                               state->smb2.dyn, dialect_count*2);
+}
+
+static void smbXcli_negprot_smb2_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req =
+               tevent_req_callback_data(subreq,
+               struct tevent_req);
+       struct smbXcli_negprot_state *state =
+               tevent_req_data(req,
+               struct smbXcli_negprot_state);
+       struct smbXcli_conn *conn = state->conn;
+       size_t security_offset, security_length;
+       DATA_BLOB blob;
+       NTSTATUS status;
+       struct iovec *iov;
+       uint8_t *body;
+       size_t i;
+       uint16_t dialect_revision;
+       static const struct smb2cli_req_expected_response expected[] = {
+       {
+               .status = NT_STATUS_OK,
+               .body_size = 0x41
+       }
+       };
+
+       status = smb2cli_req_recv(subreq, state, &iov,
+                                 expected, ARRAY_SIZE(expected));
+       TALLOC_FREE(subreq);
+       if (tevent_req_nterror(req, status)) {
+               return;
+       }
+
+       body = (uint8_t *)iov[1].iov_base;
+
+       dialect_revision = SVAL(body, 4);
+
+       for (i=0; i < ARRAY_SIZE(smb2cli_prots); i++) {
+               if (smb2cli_prots[i].proto < state->min_protocol) {
+                       continue;
+               }
+
+               if (smb2cli_prots[i].proto > state->max_protocol) {
+                       continue;
+               }
+
+               if (smb2cli_prots[i].smb2_dialect != dialect_revision) {
+                       continue;
+               }
+
+               conn->protocol = smb2cli_prots[i].proto;
+               break;
+       }
+
+       if (conn->protocol == PROTOCOL_NONE) {
+               if (state->min_protocol >= PROTOCOL_SMB2_02) {
+                       tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+                       return;
+               }
+
+               if (dialect_revision != SMB2_DIALECT_REVISION_2FF) {
+                       tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+                       return;
+               }
+
+               /* make sure we do not loop forever */
+               state->min_protocol = PROTOCOL_SMB2_02;
+
+               /*
+                * send a SMB2 negprot, in order to negotiate
+                * the SMB2 dialect.
+                */
+               subreq = smbXcli_negprot_smb2_subreq(state);
+               if (tevent_req_nomem(subreq, req)) {
+                       return;
+               }
+               tevent_req_set_callback(subreq, smbXcli_negprot_smb2_done, req);
+               return;
+       }
+
+       conn->smb2.server.security_mode = SVAL(body, 2);
+
+       blob = data_blob_const(body + 8, 16);
+       status = GUID_from_data_blob(&blob, &conn->smb2.server.guid);
+       if (tevent_req_nterror(req, status)) {
+               return;
+       }
+
+       conn->smb2.server.capabilities  = IVAL(body, 24);
+       conn->smb2.server.max_trans_size= IVAL(body, 28);
+       conn->smb2.server.max_read_size = IVAL(body, 32);
+       conn->smb2.server.max_write_size= IVAL(body, 36);
+       conn->smb2.server.system_time   = BVAL(body, 40);
+       conn->smb2.server.start_time    = BVAL(body, 48);
+
+       security_offset = SVAL(body, 56);
+       security_length = SVAL(body, 58);
+
+       if (security_offset != SMB2_HDR_BODY + iov[1].iov_len) {
+               tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+               return;
+       }
+
+       if (security_length > iov[2].iov_len) {
+               tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+               return;
+       }
+
+       conn->smb2.server.gss_blob = data_blob_talloc(conn,
+                                               iov[2].iov_base,
+                                               security_length);
+       if (tevent_req_nomem(conn->smb2.server.gss_blob.data, req)) {
+               return;
+       }
+
+       tevent_req_done(req);
+}
+
+static NTSTATUS smbXcli_negprot_dispatch_incoming(struct smbXcli_conn *conn,
+                                                 TALLOC_CTX *tmp_mem,
+                                                 uint8_t *inbuf)
+{
+       size_t num_pending = talloc_array_length(conn->pending);
+       struct tevent_req *subreq;
+       struct smbXcli_req_state *substate;
+       struct tevent_req *req;
+       uint32_t protocol_magic;
+       size_t inbuf_len = smb_len_nbt(inbuf);
+
+       if (num_pending != 1) {
+               return NT_STATUS_INTERNAL_ERROR;
+       }
+
+       if (inbuf_len < 4) {
+               return NT_STATUS_INVALID_NETWORK_RESPONSE;
+       }
+
+       subreq = conn->pending[0];
+       substate = tevent_req_data(subreq, struct smbXcli_req_state);
+       req = tevent_req_callback_data(subreq, struct tevent_req);
+
+       protocol_magic = IVAL(inbuf, 4);
+
+       switch (protocol_magic) {
+       case SMB_MAGIC:
+               tevent_req_set_callback(subreq, smbXcli_negprot_smb1_done, req);
+               conn->dispatch_incoming = smb1cli_conn_dispatch_incoming;
+               return smb1cli_conn_dispatch_incoming(conn, tmp_mem, inbuf);
+
+       case SMB2_MAGIC:
+               if (substate->smb2.recv_iov == NULL) {
+                       /*
+                        * For the SMB1 negprot we have move it.
+                        */
+                       substate->smb2.recv_iov = substate->smb1.recv_iov;
+                       substate->smb1.recv_iov = NULL;
+               }
+
+               /*
+                * we got an SMB2 answer, which consumed sequence number 0
+                * so we need to use 1 as the next one
+                */
+               conn->smb2.mid = 1;
+               tevent_req_set_callback(subreq, smbXcli_negprot_smb2_done, req);
+               conn->dispatch_incoming = smb2cli_conn_dispatch_incoming;
+               return smb2cli_conn_dispatch_incoming(conn, tmp_mem, inbuf);
+       }
+
+       DEBUG(10, ("Got non-SMB PDU\n"));
+       return NT_STATUS_INVALID_NETWORK_RESPONSE;
+}
+
+NTSTATUS smbXcli_negprot_recv(struct tevent_req *req)
+{
+       return tevent_req_simple_recv_ntstatus(req);
+}
+
+NTSTATUS smbXcli_negprot(struct smbXcli_conn *conn,
+                        uint32_t timeout_msec,
+                        enum protocol_types min_protocol,
+                        enum protocol_types max_protocol)
+{
+       TALLOC_CTX *frame = talloc_stackframe();
+       struct tevent_context *ev;
+       struct tevent_req *req;
+       NTSTATUS status = NT_STATUS_NO_MEMORY;
+       bool ok;
+
+       if (smbXcli_conn_has_async_calls(conn)) {
+               /*
+                * Can't use sync call while an async call is in flight
+                */
+               status = NT_STATUS_INVALID_PARAMETER_MIX;
+               goto fail;
+       }
+       ev = samba_tevent_context_init(frame);
+       if (ev == NULL) {
+               goto fail;
+       }
+       req = smbXcli_negprot_send(frame, ev, conn, timeout_msec,
+                                  min_protocol, max_protocol);
+       if (req == NULL) {
+               goto fail;
+       }
+       ok = tevent_req_poll(req, ev);
+       if (!ok) {
+               status = map_nt_error_from_unix_common(errno);
+               goto fail;
+       }
+       status = smbXcli_negprot_recv(req);
+ fail:
+       TALLOC_FREE(frame);
+       return status;
+}
+
+static int smbXcli_session_destructor(struct smbXcli_session *session)
+{
+       if (session->conn == NULL) {
+               return 0;
+       }
+
+       DLIST_REMOVE(session->conn->sessions, session);
+       return 0;
+}
+
+struct smbXcli_session *smbXcli_session_create(TALLOC_CTX *mem_ctx,
+                                              struct smbXcli_conn *conn)
+{
+       struct smbXcli_session *session;
+
+       session = talloc_zero(mem_ctx, struct smbXcli_session);
+       if (session == NULL) {
+               return NULL;
+       }
+       session->smb2 = talloc_zero(session, struct smb2cli_session);
+       if (session->smb2 == NULL) {
+               talloc_free(session);
+               return NULL;
+       }
+       talloc_set_destructor(session, smbXcli_session_destructor);
+
+       DLIST_ADD_END(conn->sessions, session, struct smbXcli_session *);
+       session->conn = conn;
+
+       return session;
+}
+
+struct smbXcli_session *smbXcli_session_copy(TALLOC_CTX *mem_ctx,
+                                               struct smbXcli_session *src)
+{
+       struct smbXcli_session *session;
+
+       session = talloc_zero(mem_ctx, struct smbXcli_session);
+       if (session == NULL) {
+               return NULL;
+       }
+       session->smb2 = talloc_zero(session, struct smb2cli_session);
+       if (session->smb2 == NULL) {
+               talloc_free(session);
+               return NULL;
+       }
+
+       session->conn = src->conn;
+       *session->smb2 = *src->smb2;
+       session->smb2_channel = src->smb2_channel;
+       session->disconnect_expired = src->disconnect_expired;
+
+       DLIST_ADD_END(src->conn->sessions, session, struct smbXcli_session *);
+       talloc_set_destructor(session, smbXcli_session_destructor);
+
+       return session;
+}
+
+
+NTSTATUS smbXcli_session_application_key(struct smbXcli_session *session,
+                                        TALLOC_CTX *mem_ctx,
+                                        DATA_BLOB *key)
+{
+       const DATA_BLOB *application_key;
+
+       *key = data_blob_null;
+
+       if (session->conn == NULL) {
+               return NT_STATUS_NO_USER_SESSION_KEY;
+       }
+
+       if (session->conn->protocol >= PROTOCOL_SMB2_02) {
+               application_key = &session->smb2->application_key;
+       } else {
+               application_key = &session->smb1.application_key;
+       }
+
+       if (application_key->length == 0) {
+               return NT_STATUS_NO_USER_SESSION_KEY;
+       }
+
+       *key = data_blob_dup_talloc(mem_ctx, *application_key);
+       if (key->data == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       return NT_STATUS_OK;
+}
+
+void smbXcli_session_set_disconnect_expired(struct smbXcli_session *session)
+{
+       session->disconnect_expired = true;
+}
+
+uint16_t smb1cli_session_current_id(struct smbXcli_session *session)
+{
+       return session->smb1.session_id;
+}
+
+void smb1cli_session_set_id(struct smbXcli_session *session,
+                           uint16_t session_id)
+{
+       session->smb1.session_id = session_id;
+}
+
+NTSTATUS smb1cli_session_set_session_key(struct smbXcli_session *session,
+                                        const DATA_BLOB _session_key)
+{
+       struct smbXcli_conn *conn = session->conn;
+       uint8_t session_key[16];
+
+       if (conn == NULL) {
+               return NT_STATUS_INVALID_PARAMETER_MIX;
+       }
+
+       if (session->smb1.application_key.length != 0) {
+               /*
+                * TODO: do not allow this...
+                *
+                * return NT_STATUS_INVALID_PARAMETER_MIX;
+                */
+               data_blob_clear_free(&session->smb1.application_key);
+               session->smb1.protected_key = false;
+       }
+
+       if (_session_key.length == 0) {
+               return NT_STATUS_OK;
+       }
+
+       ZERO_STRUCT(session_key);
+       memcpy(session_key, _session_key.data,
+              MIN(_session_key.length, sizeof(session_key)));
+
+       session->smb1.application_key = data_blob_talloc(session,
+                                                        session_key,
+                                                        sizeof(session_key));
+       ZERO_STRUCT(session_key);
+       if (session->smb1.application_key.data == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       session->smb1.protected_key = false;
+
+       return NT_STATUS_OK;
+}
+
+NTSTATUS smb1cli_session_protect_session_key(struct smbXcli_session *session)
+{
+       if (session->smb1.protected_key) {
+               /* already protected */
+               return NT_STATUS_OK;
+       }
+
+       if (session->smb1.application_key.length != 16) {
+               return NT_STATUS_INVALID_PARAMETER_MIX;
+       }
+
+       smb_key_derivation(session->smb1.application_key.data,
+                          session->smb1.application_key.length,
+                          session->smb1.application_key.data);
+
+       session->smb1.protected_key = true;
+
+       return NT_STATUS_OK;
+}
+
+uint8_t smb2cli_session_security_mode(struct smbXcli_session *session)
+{
+       struct smbXcli_conn *conn = session->conn;
+       uint8_t security_mode = 0;
+
+       if (conn == NULL) {
+               return security_mode;
+       }
+
+       security_mode = SMB2_NEGOTIATE_SIGNING_ENABLED;
+       if (conn->mandatory_signing) {
+               security_mode |= SMB2_NEGOTIATE_SIGNING_REQUIRED;
+       }
+
+       return security_mode;
+}
+
+uint64_t smb2cli_session_current_id(struct smbXcli_session *session)
+{
+       return session->smb2->session_id;
+}
+
+uint16_t smb2cli_session_get_flags(struct smbXcli_session *session)
+{
+       return session->smb2->session_flags;
+}
+
+void smb2cli_session_set_id_and_flags(struct smbXcli_session *session,
+                                     uint64_t session_id,
+                                     uint16_t session_flags)
+{
+       session->smb2->session_id = session_id;
+       session->smb2->session_flags = session_flags;
+}
+
+void smb2cli_session_increment_channel_sequence(struct smbXcli_session *session)
+{
+       session->smb2->channel_sequence += 1;
+}
+
+NTSTATUS smb2cli_session_set_session_key(struct smbXcli_session *session,
+                                        const DATA_BLOB _session_key,
+                                        const struct iovec *recv_iov)
+{
+       struct smbXcli_conn *conn = session->conn;
+       uint16_t no_sign_flags;
+       uint8_t session_key[16];
+       NTSTATUS status;
+
+       if (conn == NULL) {
+               return NT_STATUS_INVALID_PARAMETER_MIX;
+       }
+
+       no_sign_flags = SMB2_SESSION_FLAG_IS_GUEST | SMB2_SESSION_FLAG_IS_NULL;
+
+       if (session->smb2->session_flags & no_sign_flags) {
+               session->smb2->should_sign = false;
+               return NT_STATUS_OK;
+       }
+
+       if (session->smb2->signing_key.length != 0) {
+               return NT_STATUS_INVALID_PARAMETER_MIX;
+       }
+
+       ZERO_STRUCT(session_key);
+       memcpy(session_key, _session_key.data,
+              MIN(_session_key.length, sizeof(session_key)));
+
+       session->smb2->signing_key = data_blob_talloc(session,
+                                                    session_key,
+                                                    sizeof(session_key));
+       if (session->smb2->signing_key.data == NULL) {
+               ZERO_STRUCT(session_key);
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       if (conn->protocol >= PROTOCOL_SMB2_24) {
+               const DATA_BLOB label = data_blob_string_const_null("SMB2AESCMAC");
+               const DATA_BLOB context = data_blob_string_const_null("SmbSign");
+
+               smb2_key_derivation(session_key, sizeof(session_key),
+                                   label.data, label.length,
+                                   context.data, context.length,
+                                   session->smb2->signing_key.data);
+       }
+
+       session->smb2->encryption_key = data_blob_dup_talloc(session,
+                                               session->smb2->signing_key);
+       if (session->smb2->encryption_key.data == NULL) {
+               ZERO_STRUCT(session_key);
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       if (conn->protocol >= PROTOCOL_SMB2_24) {
+               const DATA_BLOB label = data_blob_string_const_null("SMB2AESCCM");
+               const DATA_BLOB context = data_blob_string_const_null("ServerIn ");
+
+               smb2_key_derivation(session_key, sizeof(session_key),
+                                   label.data, label.length,
+                                   context.data, context.length,
+                                   session->smb2->encryption_key.data);
+       }
+
+       session->smb2->decryption_key = data_blob_dup_talloc(session,
+                                               session->smb2->signing_key);
+       if (session->smb2->decryption_key.data == NULL) {
+               ZERO_STRUCT(session_key);
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       if (conn->protocol >= PROTOCOL_SMB2_24) {
+               const DATA_BLOB label = data_blob_string_const_null("SMB2AESCCM");
+               const DATA_BLOB context = data_blob_string_const_null("ServerOut");
+
+               smb2_key_derivation(session_key, sizeof(session_key),
+                                   label.data, label.length,
+                                   context.data, context.length,
+                                   session->smb2->decryption_key.data);
+       }
+
+       session->smb2->application_key = data_blob_dup_talloc(session,
+                                               session->smb2->signing_key);
+       if (session->smb2->application_key.data == NULL) {
+               ZERO_STRUCT(session_key);
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       if (conn->protocol >= PROTOCOL_SMB2_24) {
+               const DATA_BLOB label = data_blob_string_const_null("SMB2APP");
+               const DATA_BLOB context = data_blob_string_const_null("SmbRpc");
+
+               smb2_key_derivation(session_key, sizeof(session_key),
+                                   label.data, label.length,
+                                   context.data, context.length,
+                                   session->smb2->application_key.data);
+       }
+       ZERO_STRUCT(session_key);
+
+       session->smb2_channel.signing_key = data_blob_dup_talloc(session,
+                                               session->smb2->signing_key);
+       if (session->smb2_channel.signing_key.data == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       status = smb2_signing_check_pdu(session->smb2_channel.signing_key,
+                                       session->conn->protocol,
+                                       recv_iov, 3);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       session->smb2->should_sign = false;
+       session->smb2->should_encrypt = false;
+
+       if (conn->desire_signing) {
+               session->smb2->should_sign = true;
+       }
+
+       if (conn->smb2.server.security_mode & SMB2_NEGOTIATE_SIGNING_REQUIRED) {
+               session->smb2->should_sign = true;
+       }
+
+       if (session->smb2->session_flags & SMB2_SESSION_FLAG_ENCRYPT_DATA) {
+               session->smb2->should_encrypt = true;
+       }
+
+       if (conn->protocol < PROTOCOL_SMB2_24) {
+               session->smb2->should_encrypt = false;
+       }
+
+       if (!(conn->smb2.server.capabilities & SMB2_CAP_ENCRYPTION)) {
+               session->smb2->should_encrypt = false;
+       }
+
+       generate_random_buffer((uint8_t *)&session->smb2->nonce_high,
+                              sizeof(session->smb2->nonce_high));
+       session->smb2->nonce_low = 1;
+
+       return NT_STATUS_OK;
+}
+
+NTSTATUS smb2cli_session_create_channel(TALLOC_CTX *mem_ctx,
+                                       struct smbXcli_session *session1,
+                                       struct smbXcli_conn *conn,
+                                       struct smbXcli_session **_session2)
+{
+       struct smbXcli_session *session2;
+
+       if (session1->smb2->signing_key.length == 0) {
+               return NT_STATUS_INVALID_PARAMETER_MIX;
+       }
+
+       if (conn == NULL) {
+               return NT_STATUS_INVALID_PARAMETER_MIX;
+       }
+
+       session2 = talloc_zero(mem_ctx, struct smbXcli_session);
+       if (session2 == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       session2->smb2 = talloc_reference(session2, session1->smb2);
+       if (session2->smb2 == NULL) {
+               talloc_free(session2);
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       talloc_set_destructor(session2, smbXcli_session_destructor);
+       DLIST_ADD_END(conn->sessions, session2, struct smbXcli_session *);
+       session2->conn = conn;
+
+       *_session2 = session2;
+       return NT_STATUS_OK;
+}
+
+NTSTATUS smb2cli_session_set_channel_key(struct smbXcli_session *session,
+                                        const DATA_BLOB _channel_key,
+                                        const struct iovec *recv_iov)
+{
+       struct smbXcli_conn *conn = session->conn;
+       uint8_t channel_key[16];
+       NTSTATUS status;
+
+       if (conn == NULL) {
+               return NT_STATUS_INVALID_PARAMETER_MIX;
+       }
+
+       if (session->smb2_channel.signing_key.length != 0) {
+               return NT_STATUS_INVALID_PARAMETER_MIX;
+       }
+
+       ZERO_STRUCT(channel_key);
+       memcpy(channel_key, _channel_key.data,
+              MIN(_channel_key.length, sizeof(channel_key)));
+
+       session->smb2_channel.signing_key = data_blob_talloc(session,
+                                               channel_key,
+                                               sizeof(channel_key));
+       if (session->smb2_channel.signing_key.data == NULL) {
+               ZERO_STRUCT(channel_key);
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       if (conn->protocol >= PROTOCOL_SMB2_24) {
+               const DATA_BLOB label = data_blob_string_const_null("SMB2AESCMAC");
+               const DATA_BLOB context = data_blob_string_const_null("SmbSign");
+
+               smb2_key_derivation(channel_key, sizeof(channel_key),
+                                   label.data, label.length,
+                                   context.data, context.length,
+                                   session->smb2_channel.signing_key.data);
+       }
+       ZERO_STRUCT(channel_key);
+
+       status = smb2_signing_check_pdu(session->smb2_channel.signing_key,
+                                       session->conn->protocol,
+                                       recv_iov, 3);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       return NT_STATUS_OK;
+}
+
+struct smbXcli_tcon *smbXcli_tcon_create(TALLOC_CTX *mem_ctx)
+{
+       struct smbXcli_tcon *tcon;
+
+       tcon = talloc_zero(mem_ctx, struct smbXcli_tcon);
+       if (tcon == NULL) {
+               return NULL;
+       }
+
+       return tcon;
+}
+
+uint16_t smb1cli_tcon_current_id(struct smbXcli_tcon *tcon)
+{
+       return tcon->smb1.tcon_id;
+}
+
+void smb1cli_tcon_set_id(struct smbXcli_tcon *tcon, uint16_t tcon_id)
+{
+       tcon->smb1.tcon_id = tcon_id;
+}
+
+bool smb1cli_tcon_set_values(struct smbXcli_tcon *tcon,
+                            uint16_t tcon_id,
+                            uint16_t optional_support,
+                            uint32_t maximal_access,
+                            uint32_t guest_maximal_access,
+                            const char *service,
+                            const char *fs_type)
+{
+       tcon->smb1.tcon_id = tcon_id;
+       tcon->smb1.optional_support = optional_support;
+       tcon->smb1.maximal_access = maximal_access;
+       tcon->smb1.guest_maximal_access = guest_maximal_access;
+
+       TALLOC_FREE(tcon->smb1.service);
+       tcon->smb1.service = talloc_strdup(tcon, service);
+       if (service != NULL && tcon->smb1.service == NULL) {
+               return false;
+       }
+
+       TALLOC_FREE(tcon->smb1.fs_type);
+       tcon->smb1.fs_type = talloc_strdup(tcon, fs_type);
+       if (fs_type != NULL && tcon->smb1.fs_type == NULL) {
+               return false;
+       }
+
+       return true;
+}
+
+uint32_t smb2cli_tcon_current_id(struct smbXcli_tcon *tcon)
+{
+       return tcon->smb2.tcon_id;
+}
+
+uint32_t smb2cli_tcon_capabilities(struct smbXcli_tcon *tcon)
+{
+       return tcon->smb2.capabilities;
+}
+
+void smb2cli_tcon_set_values(struct smbXcli_tcon *tcon,
+                            struct smbXcli_session *session,
+                            uint32_t tcon_id,
+                            uint8_t type,
+                            uint32_t flags,
+                            uint32_t capabilities,
+                            uint32_t maximal_access)
+{
+       tcon->smb2.tcon_id = tcon_id;
+       tcon->smb2.type = type;
+       tcon->smb2.flags = flags;
+       tcon->smb2.capabilities = capabilities;
+       tcon->smb2.maximal_access = maximal_access;
+
+       tcon->smb2.should_encrypt = false;
+
+       if (session == NULL) {
+               return;
+       }
+
+       tcon->smb2.should_encrypt = session->smb2->should_encrypt;
+
+       if (flags & SMB2_SHAREFLAG_ENCRYPT_DATA) {
+               tcon->smb2.should_encrypt = true;
+       }
+}