s3:smbd: add a comment stating that file_close_user() is redundant for SMB2
[nivanova/samba-autobuild/.git] / source3 / smbd / smbXsrv_session.c
index d8514d87ad9d052f2e43e6bf3e5ebc86495219fc..19f4bc05600b507f88597b8084c5b4a32f838297 100644 (file)
 
 #include "includes.h"
 #include "system/filesys.h"
+#include <tevent.h>
+#include "lib/util/server_id.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_rbt.h"
 #include "dbwrap/dbwrap_open.h"
+#include "dbwrap/dbwrap_watch.h"
 #include "session.h"
 #include "auth.h"
 #include "auth/gensec/gensec.h"
 #include "lib/util/util_tdb.h"
 #include "librpc/gen_ndr/ndr_smbXsrv.h"
 #include "serverid.h"
+#include "lib/util/tevent_ntstatus.h"
 
 struct smbXsrv_session_table {
        struct {
                struct db_context *db_ctx;
                uint32_t lowest_id;
                uint32_t highest_id;
+               uint32_t max_sessions;
                uint32_t num_sessions;
        } local;
        struct {
@@ -49,9 +54,10 @@ struct smbXsrv_session_table {
 
 static struct db_context *smbXsrv_session_global_db_ctx = NULL;
 
-NTSTATUS smbXsrv_session_global_init(void)
+NTSTATUS smbXsrv_session_global_init(struct messaging_context *msg_ctx)
 {
-       const char *global_path = NULL;
+       char *global_path = NULL;
+       struct db_context *backend = NULL;
        struct db_context *db_ctx = NULL;
 
        if (smbXsrv_session_global_db_ctx != NULL) {
@@ -61,16 +67,21 @@ NTSTATUS smbXsrv_session_global_init(void)
        /*
         * This contains secret information like session keys!
         */
-       global_path = lock_path("smbXsrv_session_global.tdb");
-
-       db_ctx = db_open(NULL, global_path,
-                        0, /* hash_size */
-                        TDB_DEFAULT |
-                        TDB_CLEAR_IF_FIRST |
-                        TDB_INCOMPATIBLE_HASH,
-                        O_RDWR | O_CREAT, 0600,
-                        DBWRAP_LOCK_ORDER_1);
-       if (db_ctx == NULL) {
+       global_path = lock_path(talloc_tos(), "smbXsrv_session_global.tdb");
+       if (global_path == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       backend = db_open(NULL, global_path,
+                         0, /* hash_size */
+                         TDB_DEFAULT |
+                         TDB_CLEAR_IF_FIRST |
+                         TDB_INCOMPATIBLE_HASH,
+                         O_RDWR | O_CREAT, 0600,
+                         DBWRAP_LOCK_ORDER_1,
+                         DBWRAP_FLAG_NONE);
+       TALLOC_FREE(global_path);
+       if (backend == NULL) {
                NTSTATUS status;
 
                status = map_nt_error_from_unix_common(errno);
@@ -78,6 +89,12 @@ NTSTATUS smbXsrv_session_global_init(void)
                return status;
        }
 
+       db_ctx = db_open_watched(NULL, &backend, server_messaging_context());
+       if (db_ctx == NULL) {
+               TALLOC_FREE(backend);
+               return NT_STATUS_NO_MEMORY;
+       }
+
        smbXsrv_session_global_db_ctx = db_ctx;
 
        return NT_STATUS_OK;
@@ -152,14 +169,74 @@ static NTSTATUS smbXsrv_session_local_key_to_id(TDB_DATA key, uint32_t *id)
        return NT_STATUS_OK;
 }
 
+static struct db_record *smbXsrv_session_global_fetch_locked(
+                       struct db_context *db,
+                       uint32_t id,
+                       TALLOC_CTX *mem_ctx)
+{
+       TDB_DATA key;
+       uint8_t key_buf[SMBXSRV_SESSION_GLOBAL_TDB_KEY_SIZE];
+       struct db_record *rec = NULL;
+
+       key = smbXsrv_session_global_id_to_key(id, key_buf);
+
+       rec = dbwrap_fetch_locked(db, mem_ctx, key);
+
+       if (rec == NULL) {
+               DBG_DEBUG("Failed to lock global id 0x%08x, key '%s'\n", id,
+                         hex_encode_talloc(talloc_tos(), key.dptr, key.dsize));
+       }
+
+       return rec;
+}
+
+static struct db_record *smbXsrv_session_local_fetch_locked(
+                       struct db_context *db,
+                       uint32_t id,
+                       TALLOC_CTX *mem_ctx)
+{
+       TDB_DATA key;
+       uint8_t key_buf[SMBXSRV_SESSION_LOCAL_TDB_KEY_SIZE];
+       struct db_record *rec = NULL;
+
+       key = smbXsrv_session_local_id_to_key(id, key_buf);
+
+       rec = dbwrap_fetch_locked(db, mem_ctx, key);
+
+       if (rec == NULL) {
+               DBG_DEBUG("Failed to lock local id 0x%08x, key '%s'\n", id,
+                         hex_encode_talloc(talloc_tos(), key.dptr, key.dsize));
+       }
+
+       return rec;
+}
+
+static void smbXsrv_session_close_loop(struct tevent_req *subreq);
+
 static NTSTATUS smbXsrv_session_table_init(struct smbXsrv_connection *conn,
                                           uint32_t lowest_id,
-                                          uint32_t highest_id)
+                                          uint32_t highest_id,
+                                          uint32_t max_sessions)
 {
+       struct smbXsrv_client *client = conn->client;
        struct smbXsrv_session_table *table;
        NTSTATUS status;
+       struct tevent_req *subreq;
+       uint64_t max_range;
+
+       if (lowest_id > highest_id) {
+               return NT_STATUS_INTERNAL_ERROR;
+       }
+
+       max_range = highest_id;
+       max_range -= lowest_id;
+       max_range += 1;
 
-       table = talloc_zero(conn, struct smbXsrv_session_table);
+       if (max_sessions > max_range) {
+               return NT_STATUS_INTERNAL_ERROR;
+       }
+
+       table = talloc_zero(client, struct smbXsrv_session_table);
        if (table == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -171,8 +248,9 @@ static NTSTATUS smbXsrv_session_table_init(struct smbXsrv_connection *conn,
        }
        table->local.lowest_id = lowest_id;
        table->local.highest_id = highest_id;
+       table->local.max_sessions = max_sessions;
 
-       status = smbXsrv_session_global_init();
+       status = smbXsrv_session_global_init(client->msg_ctx);
        if (!NT_STATUS_IS_OK(status)) {
                TALLOC_FREE(table);
                return status;
@@ -180,10 +258,186 @@ static NTSTATUS smbXsrv_session_table_init(struct smbXsrv_connection *conn,
 
        table->global.db_ctx = smbXsrv_session_global_db_ctx;
 
-       conn->session_table = table;
+       subreq = messaging_read_send(table,
+                                    client->raw_ev_ctx,
+                                    client->msg_ctx,
+                                    MSG_SMBXSRV_SESSION_CLOSE);
+       if (subreq == NULL) {
+               TALLOC_FREE(table);
+               return NT_STATUS_NO_MEMORY;
+       }
+       tevent_req_set_callback(subreq, smbXsrv_session_close_loop, client);
+
+       client->session_table = table;
        return NT_STATUS_OK;
 }
 
+static void smbXsrv_session_close_shutdown_done(struct tevent_req *subreq);
+
+static void smbXsrv_session_close_loop(struct tevent_req *subreq)
+{
+       struct smbXsrv_client *client =
+               tevent_req_callback_data(subreq,
+               struct smbXsrv_client);
+       struct smbXsrv_session_table *table = client->session_table;
+       int ret;
+       struct messaging_rec *rec = NULL;
+       struct smbXsrv_session_closeB close_blob;
+       enum ndr_err_code ndr_err;
+       struct smbXsrv_session_close0 *close_info0 = NULL;
+       struct smbXsrv_session *session = NULL;
+       NTSTATUS status;
+       struct timeval tv = timeval_current();
+       NTTIME now = timeval_to_nttime(&tv);
+
+       ret = messaging_read_recv(subreq, talloc_tos(), &rec);
+       TALLOC_FREE(subreq);
+       if (ret != 0) {
+               goto next;
+       }
+
+       ndr_err = ndr_pull_struct_blob(&rec->buf, rec, &close_blob,
+                       (ndr_pull_flags_fn_t)ndr_pull_smbXsrv_session_closeB);
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               status = ndr_map_error2ntstatus(ndr_err);
+               DEBUG(1,("smbXsrv_session_close_loop: "
+                        "ndr_pull_struct_blob - %s\n",
+                        nt_errstr(status)));
+               goto next;
+       }
+
+       DEBUG(10,("smbXsrv_session_close_loop: MSG_SMBXSRV_SESSION_CLOSE\n"));
+       if (DEBUGLVL(10)) {
+               NDR_PRINT_DEBUG(smbXsrv_session_closeB, &close_blob);
+       }
+
+       if (close_blob.version != SMBXSRV_VERSION_0) {
+               DEBUG(0,("smbXsrv_session_close_loop: "
+                        "ignore invalid version %u\n", close_blob.version));
+               NDR_PRINT_DEBUG(smbXsrv_session_closeB, &close_blob);
+               goto next;
+       }
+
+       close_info0 = close_blob.info.info0;
+       if (close_info0 == NULL) {
+               DEBUG(0,("smbXsrv_session_close_loop: "
+                        "ignore NULL info %u\n", close_blob.version));
+               NDR_PRINT_DEBUG(smbXsrv_session_closeB, &close_blob);
+               goto next;
+       }
+
+       status = smb2srv_session_lookup_client(client,
+                                              close_info0->old_session_wire_id,
+                                              now, &session);
+       if (NT_STATUS_EQUAL(status, NT_STATUS_USER_SESSION_DELETED)) {
+               DEBUG(4,("smbXsrv_session_close_loop: "
+                        "old_session_wire_id %llu not found\n",
+                        (unsigned long long)close_info0->old_session_wire_id));
+               if (DEBUGLVL(4)) {
+                       NDR_PRINT_DEBUG(smbXsrv_session_closeB, &close_blob);
+               }
+               goto next;
+       }
+       if (!NT_STATUS_IS_OK(status) &&
+           !NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED) &&
+           !NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_SESSION_EXPIRED)) {
+               DEBUG(1,("smbXsrv_session_close_loop: "
+                        "old_session_wire_id %llu - %s\n",
+                        (unsigned long long)close_info0->old_session_wire_id,
+                        nt_errstr(status)));
+               if (DEBUGLVL(1)) {
+                       NDR_PRINT_DEBUG(smbXsrv_session_closeB, &close_blob);
+               }
+               goto next;
+       }
+
+       if (session->global->session_global_id != close_info0->old_session_global_id) {
+               DEBUG(1,("smbXsrv_session_close_loop: "
+                        "old_session_wire_id %llu - global %u != %u\n",
+                        (unsigned long long)close_info0->old_session_wire_id,
+                        session->global->session_global_id,
+                        close_info0->old_session_global_id));
+               if (DEBUGLVL(1)) {
+                       NDR_PRINT_DEBUG(smbXsrv_session_closeB, &close_blob);
+               }
+               goto next;
+       }
+
+       if (session->global->creation_time != close_info0->old_creation_time) {
+               DEBUG(1,("smbXsrv_session_close_loop: "
+                        "old_session_wire_id %llu - "
+                        "creation %s (%llu) != %s (%llu)\n",
+                        (unsigned long long)close_info0->old_session_wire_id,
+                        nt_time_string(rec, session->global->creation_time),
+                        (unsigned long long)session->global->creation_time,
+                        nt_time_string(rec, close_info0->old_creation_time),
+                        (unsigned long long)close_info0->old_creation_time));
+               if (DEBUGLVL(1)) {
+                       NDR_PRINT_DEBUG(smbXsrv_session_closeB, &close_blob);
+               }
+               goto next;
+       }
+
+       subreq = smb2srv_session_shutdown_send(session, client->raw_ev_ctx,
+                                              session, NULL);
+       if (subreq == NULL) {
+               status = NT_STATUS_NO_MEMORY;
+               DEBUG(0, ("smbXsrv_session_close_loop: "
+                         "smb2srv_session_shutdown_send(%llu) failed: %s\n",
+                         (unsigned long long)session->global->session_wire_id,
+                         nt_errstr(status)));
+               if (DEBUGLVL(1)) {
+                       NDR_PRINT_DEBUG(smbXsrv_session_closeB, &close_blob);
+               }
+               goto next;
+       }
+       tevent_req_set_callback(subreq,
+                               smbXsrv_session_close_shutdown_done,
+                               session);
+
+next:
+       TALLOC_FREE(rec);
+
+       subreq = messaging_read_send(table,
+                                    client->raw_ev_ctx,
+                                    client->msg_ctx,
+                                    MSG_SMBXSRV_SESSION_CLOSE);
+       if (subreq == NULL) {
+               const char *r;
+               r = "messaging_read_send(MSG_SMBXSRV_SESSION_CLOSE) failed";
+               exit_server_cleanly(r);
+               return;
+       }
+       tevent_req_set_callback(subreq, smbXsrv_session_close_loop, client);
+}
+
+static void smbXsrv_session_close_shutdown_done(struct tevent_req *subreq)
+{
+       struct smbXsrv_session *session =
+               tevent_req_callback_data(subreq,
+               struct smbXsrv_session);
+       NTSTATUS status;
+
+       status = smb2srv_session_shutdown_recv(subreq);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("smbXsrv_session_close_loop: "
+                         "smb2srv_session_shutdown_recv(%llu) failed: %s\n",
+                         (unsigned long long)session->global->session_wire_id,
+                         nt_errstr(status)));
+       }
+
+       status = smbXsrv_session_logoff(session);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("smbXsrv_session_close_loop: "
+                         "smbXsrv_session_logoff(%llu) failed: %s\n",
+                         (unsigned long long)session->global->session_wire_id,
+                         nt_errstr(status)));
+       }
+
+       TALLOC_FREE(session);
+}
+
 struct smb1srv_session_local_allocate_state {
        const uint32_t lowest_id;
        const uint32_t highest_id;
@@ -260,8 +514,6 @@ static NTSTATUS smb1srv_session_local_allocate_id(struct db_context *db,
 
        for (i = 0; i < (range / 2); i++) {
                uint32_t id;
-               uint8_t key_buf[SMBXSRV_SESSION_LOCAL_TDB_KEY_SIZE];
-               TDB_DATA key;
                TDB_DATA val;
                struct db_record *rec = NULL;
 
@@ -275,9 +527,7 @@ static NTSTATUS smb1srv_session_local_allocate_id(struct db_context *db,
                        id = highest_id;
                }
 
-               key = smbXsrv_session_local_id_to_key(id, key_buf);
-
-               rec = dbwrap_fetch_locked(db, mem_ctx, key);
+               rec = smbXsrv_session_local_fetch_locked(db, id, mem_ctx);
                if (rec == NULL) {
                        return NT_STATUS_INSUFFICIENT_RESOURCES;
                }
@@ -327,16 +577,12 @@ static NTSTATUS smb1srv_session_local_allocate_id(struct db_context *db,
 
        if (NT_STATUS_IS_OK(state.status)) {
                uint32_t id;
-               uint8_t key_buf[SMBXSRV_SESSION_LOCAL_TDB_KEY_SIZE];
-               TDB_DATA key;
                TDB_DATA val;
                struct db_record *rec = NULL;
 
                id = state.useable_id;
 
-               key = smbXsrv_session_local_id_to_key(id, key_buf);
-
-               rec = dbwrap_fetch_locked(db, mem_ctx, key);
+               rec = smbXsrv_session_local_fetch_locked(db, id, mem_ctx);
                if (rec == NULL) {
                        return NT_STATUS_INSUFFICIENT_RESOURCES;
                }
@@ -378,6 +624,8 @@ static void smbXsrv_session_local_fetch_parser(TDB_DATA key, TDB_DATA data,
 }
 
 static NTSTATUS smbXsrv_session_local_lookup(struct smbXsrv_session_table *table,
+                                            /* conn: optional */
+                                            struct smbXsrv_connection *conn,
                                             uint32_t session_local_id,
                                             NTTIME now,
                                             struct smbXsrv_session **_session)
@@ -423,6 +671,19 @@ static NTSTATUS smbXsrv_session_local_lookup(struct smbXsrv_session_table *table
                return NT_STATUS_USER_SESSION_DELETED;
        }
 
+       /*
+        * If a connection is specified check if the session is
+        * valid on the channel.
+        */
+       if (conn != NULL) {
+               struct smbXsrv_channel_global0 *c = NULL;
+
+               status = smbXsrv_session_find_channel(state.session, conn, &c);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return status;
+               }
+       }
+
        state.session->idle_time = now;
 
        if (!NT_STATUS_IS_OK(state.session->status)) {
@@ -476,8 +737,6 @@ static NTSTATUS smbXsrv_session_global_allocate(struct db_context *db,
                bool is_free = false;
                bool was_free = false;
                uint32_t id;
-               uint8_t key_buf[SMBXSRV_SESSION_GLOBAL_TDB_KEY_SIZE];
-               TDB_DATA key;
 
                if (i >= min_tries && last_free != 0) {
                        id = last_free;
@@ -491,9 +750,8 @@ static NTSTATUS smbXsrv_session_global_allocate(struct db_context *db,
                        id--;
                }
 
-               key = smbXsrv_session_global_id_to_key(id, key_buf);
-
-               global->db_rec = dbwrap_fetch_locked(db, mem_ctx, key);
+               global->db_rec = smbXsrv_session_global_fetch_locked(db, id,
+                                                                    mem_ctx);
                if (global->db_rec == NULL) {
                        talloc_free(global);
                        return NT_STATUS_INSUFFICIENT_RESOURCES;
@@ -585,6 +843,10 @@ static void smbXsrv_session_global_verify_record(struct db_record *db_rec,
                         hex_encode_talloc(frame, key.dptr, key.dsize),
                         nt_errstr(status)));
                TALLOC_FREE(frame);
+               *is_free = true;
+               if (was_free) {
+                       *was_free = true;
+               }
                return;
        }
 
@@ -600,6 +862,10 @@ static void smbXsrv_session_global_verify_record(struct db_record *db_rec,
                         global_blob.version));
                NDR_PRINT_DEBUG(smbXsrv_session_globalB, &global_blob);
                TALLOC_FREE(frame);
+               *is_free = true;
+               if (was_free) {
+                       *was_free = true;
+               }
                return;
        }
 
@@ -607,10 +873,12 @@ static void smbXsrv_session_global_verify_record(struct db_record *db_rec,
 
        exists = serverid_exists(&global->channels[0].server_id);
        if (!exists) {
+               struct server_id_buf idbuf;
                DEBUG(2,("smbXsrv_session_global_verify_record: "
                         "key '%s' server_id %s does not exist.\n",
                         hex_encode_talloc(frame, key.dptr, key.dsize),
-                        server_id_str(frame, &global->channels[0].server_id)));
+                        server_id_str_buf(global->channels[0].server_id,
+                                          &idbuf)));
                if (DEBUGLVL(2)) {
                        NDR_PRINT_DEBUG(smbXsrv_session_globalB, &global_blob);
                }
@@ -688,11 +956,248 @@ static NTSTATUS smbXsrv_session_global_store(struct smbXsrv_session_global0 *glo
        return NT_STATUS_OK;
 }
 
-static int smbXsrv_session_destructor(struct smbXsrv_session *session)
+struct smb2srv_session_close_previous_state {
+       struct tevent_context *ev;
+       struct smbXsrv_connection *connection;
+       struct dom_sid *current_sid;
+       uint64_t previous_session_id;
+       uint64_t current_session_id;
+       struct db_record *db_rec;
+};
+
+static void smb2srv_session_close_previous_check(struct tevent_req *req);
+static void smb2srv_session_close_previous_modified(struct tevent_req *subreq);
+
+struct tevent_req *smb2srv_session_close_previous_send(TALLOC_CTX *mem_ctx,
+                                       struct tevent_context *ev,
+                                       struct smbXsrv_connection *conn,
+                                       struct auth_session_info *session_info,
+                                       uint64_t previous_session_id,
+                                       uint64_t current_session_id)
+{
+       struct tevent_req *req;
+       struct smb2srv_session_close_previous_state *state;
+       uint32_t global_id = previous_session_id & UINT32_MAX;
+       uint64_t global_zeros = previous_session_id & 0xFFFFFFFF00000000LLU;
+       struct smbXsrv_session_table *table = conn->client->session_table;
+       struct security_token *current_token = NULL;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct smb2srv_session_close_previous_state);
+       if (req == NULL) {
+               return NULL;
+       }
+       state->ev = ev;
+       state->connection = conn;
+       state->previous_session_id = previous_session_id;
+       state->current_session_id = current_session_id;
+
+       if (global_zeros != 0) {
+               tevent_req_done(req);
+               return tevent_req_post(req, ev);
+       }
+
+       if (session_info == NULL) {
+               tevent_req_done(req);
+               return tevent_req_post(req, ev);
+       }
+       current_token = session_info->security_token;
+
+       if (current_token->num_sids > PRIMARY_USER_SID_INDEX) {
+               state->current_sid = &current_token->sids[PRIMARY_USER_SID_INDEX];
+       }
+
+       if (state->current_sid == NULL) {
+               tevent_req_done(req);
+               return tevent_req_post(req, ev);
+       }
+
+       if (!security_token_has_nt_authenticated_users(current_token)) {
+               /* TODO */
+               tevent_req_done(req);
+               return tevent_req_post(req, ev);
+       }
+
+       state->db_rec = smbXsrv_session_global_fetch_locked(
+                                                       table->global.db_ctx,
+                                                       global_id,
+                                                       state /* TALLOC_CTX */);
+       if (state->db_rec == NULL) {
+               tevent_req_nterror(req, NT_STATUS_UNSUCCESSFUL);
+               return tevent_req_post(req, ev);
+       }
+
+       smb2srv_session_close_previous_check(req);
+       if (!tevent_req_is_in_progress(req)) {
+               return tevent_req_post(req, ev);
+       }
+
+       return req;
+}
+
+static void smb2srv_session_close_previous_check(struct tevent_req *req)
+{
+       struct smb2srv_session_close_previous_state *state =
+               tevent_req_data(req,
+               struct smb2srv_session_close_previous_state);
+       struct smbXsrv_connection *conn = state->connection;
+       DATA_BLOB blob;
+       struct security_token *previous_token = NULL;
+       struct smbXsrv_session_global0 *global = NULL;
+       enum ndr_err_code ndr_err;
+       struct smbXsrv_session_close0 close_info0;
+       struct smbXsrv_session_closeB close_blob;
+       struct tevent_req *subreq = NULL;
+       NTSTATUS status;
+       bool is_free = false;
+
+       smbXsrv_session_global_verify_record(state->db_rec,
+                                            &is_free,
+                                            NULL,
+                                            state,
+                                            &global);
+
+       if (is_free) {
+               TALLOC_FREE(state->db_rec);
+               tevent_req_done(req);
+               return;
+       }
+
+       if (global->auth_session_info == NULL) {
+               TALLOC_FREE(state->db_rec);
+               tevent_req_done(req);
+               return;
+       }
+
+       previous_token = global->auth_session_info->security_token;
+
+       if (!security_token_is_sid(previous_token, state->current_sid)) {
+               TALLOC_FREE(state->db_rec);
+               tevent_req_done(req);
+               return;
+       }
+
+       subreq = dbwrap_watched_watch_send(state, state->ev, state->db_rec,
+                                          (struct server_id){0});
+       if (tevent_req_nomem(subreq, req)) {
+               TALLOC_FREE(state->db_rec);
+               return;
+       }
+       tevent_req_set_callback(subreq,
+                               smb2srv_session_close_previous_modified,
+                               req);
+
+       close_info0.old_session_global_id = global->session_global_id;
+       close_info0.old_session_wire_id = global->session_wire_id;
+       close_info0.old_creation_time = global->creation_time;
+       close_info0.new_session_wire_id = state->current_session_id;
+
+       ZERO_STRUCT(close_blob);
+       close_blob.version = smbXsrv_version_global_current();
+       close_blob.info.info0 = &close_info0;
+
+       ndr_err = ndr_push_struct_blob(&blob, state, &close_blob,
+                       (ndr_push_flags_fn_t)ndr_push_smbXsrv_session_closeB);
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               TALLOC_FREE(state->db_rec);
+               status = ndr_map_error2ntstatus(ndr_err);
+               DEBUG(1,("smb2srv_session_close_previous_check: "
+                        "old_session[%llu] new_session[%llu] ndr_push - %s\n",
+                        (unsigned long long)close_info0.old_session_wire_id,
+                        (unsigned long long)close_info0.new_session_wire_id,
+                        nt_errstr(status)));
+               tevent_req_nterror(req, status);
+               return;
+       }
+
+       status = messaging_send(conn->client->msg_ctx,
+                               global->channels[0].server_id,
+                               MSG_SMBXSRV_SESSION_CLOSE, &blob);
+       TALLOC_FREE(state->db_rec);
+       if (tevent_req_nterror(req, status)) {
+               return;
+       }
+
+       TALLOC_FREE(global);
+       return;
+}
+
+static void smb2srv_session_close_previous_modified(struct tevent_req *subreq)
 {
+       struct tevent_req *req =
+               tevent_req_callback_data(subreq,
+               struct tevent_req);
+       struct smb2srv_session_close_previous_state *state =
+               tevent_req_data(req,
+               struct smb2srv_session_close_previous_state);
+       uint32_t global_id;
        NTSTATUS status;
 
+       status = dbwrap_watched_watch_recv(subreq, NULL, NULL);
+       TALLOC_FREE(subreq);
+       if (tevent_req_nterror(req, status)) {
+               return;
+       }
+
+       global_id = state->previous_session_id & UINT32_MAX;
+
+       state->db_rec = smbXsrv_session_global_fetch_locked(
+               state->connection->client->session_table->global.db_ctx,
+               global_id, state /* TALLOC_CTX */);
+
+       smb2srv_session_close_previous_check(req);
+}
+
+NTSTATUS smb2srv_session_close_previous_recv(struct tevent_req *req)
+{
+       NTSTATUS status;
+
+       if (tevent_req_is_nterror(req, &status)) {
+               tevent_req_received(req);
+               return status;
+       }
+
+       tevent_req_received(req);
+       return NT_STATUS_OK;
+}
+
+static NTSTATUS smbXsrv_session_clear_and_logoff(struct smbXsrv_session *session)
+{
+       NTSTATUS status;
+       struct smbXsrv_connection *xconn = NULL;
+
+       if (session->client != NULL) {
+               xconn = session->client->connections;
+       }
+
+       for (; xconn != NULL; xconn = xconn->next) {
+               struct smbd_smb2_request *preq;
+
+               for (preq = xconn->smb2.requests; preq != NULL; preq = preq->next) {
+                       if (preq->session != session) {
+                               continue;
+                       }
+
+                       preq->session = NULL;
+                       /*
+                        * If we no longer have a session we can't
+                        * sign or encrypt replies.
+                        */
+                       preq->do_signing = false;
+                       preq->do_encryption = false;
+                       preq->preauth = NULL;
+               }
+       }
+
        status = smbXsrv_session_logoff(session);
+       return status;
+}
+
+static int smbXsrv_session_destructor(struct smbXsrv_session *session)
+{
+       NTSTATUS status;
+
+       status = smbXsrv_session_clear_and_logoff(session);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(0, ("smbXsrv_session_destructor: "
                          "smbXsrv_session_logoff() failed: %s\n",
@@ -708,17 +1213,16 @@ NTSTATUS smbXsrv_session_create(struct smbXsrv_connection *conn,
                                NTTIME now,
                                struct smbXsrv_session **_session)
 {
-       struct smbXsrv_session_table *table = conn->session_table;
-       uint32_t max_sessions = table->local.highest_id - table->local.lowest_id;
+       struct smbXsrv_session_table *table = conn->client->session_table;
        struct db_record *local_rec = NULL;
        struct smbXsrv_session *session = NULL;
        void *ptr = NULL;
        TDB_DATA val;
        struct smbXsrv_session_global0 *global = NULL;
-       struct smbXsrv_channel_global0 *channels = NULL;
+       struct smbXsrv_channel_global0 *channel = NULL;
        NTSTATUS status;
 
-       if (table->local.num_sessions >= max_sessions) {
+       if (table->local.num_sessions >= table->local.max_sessions) {
                return NT_STATUS_INSUFFICIENT_RESOURCES;
        }
 
@@ -729,7 +1233,7 @@ NTSTATUS smbXsrv_session_create(struct smbXsrv_connection *conn,
        session->table = table;
        session->idle_time = now;
        session->status = NT_STATUS_MORE_PROCESSING_REQUIRED;
-       session->connection = conn;
+       session->client = conn->client;
 
        status = smbXsrv_session_global_allocate(table->global.db_ctx,
                                                 session,
@@ -742,8 +1246,6 @@ NTSTATUS smbXsrv_session_create(struct smbXsrv_connection *conn,
 
        if (conn->protocol >= PROTOCOL_SMB2_02) {
                uint64_t id = global->session_global_id;
-               uint8_t key_buf[SMBXSRV_SESSION_LOCAL_TDB_KEY_SIZE];
-               TDB_DATA key;
 
                global->connection_dialect = conn->smb2.server.dialect;
 
@@ -757,10 +1259,10 @@ NTSTATUS smbXsrv_session_create(struct smbXsrv_connection *conn,
 
                session->local_id = global->session_global_id;
 
-               key = smbXsrv_session_local_id_to_key(session->local_id, key_buf);
-
-               local_rec = dbwrap_fetch_locked(table->local.db_ctx,
-                                               session, key);
+               local_rec = smbXsrv_session_local_fetch_locked(
+                                               table->local.db_ctx,
+                                               session->local_id,
+                                               session /* TALLOC_CTX */);
                if (local_rec == NULL) {
                        TALLOC_FREE(session);
                        return NT_STATUS_NO_MEMORY;
@@ -790,35 +1292,11 @@ NTSTATUS smbXsrv_session_create(struct smbXsrv_connection *conn,
        global->creation_time = now;
        global->expiration_time = GENSEC_EXPIRE_TIME_INFINITY;
 
-       global->num_channels = 1;
-       channels = talloc_zero_array(global,
-                                    struct smbXsrv_channel_global0,
-                                    global->num_channels);
-       if (channels == NULL) {
-               TALLOC_FREE(session);
-               return NT_STATUS_NO_MEMORY;
-       }
-       global->channels = channels;
-
-       channels[0].server_id = messaging_server_id(conn->msg_ctx);
-       channels[0].local_address = tsocket_address_string(conn->local_address,
-                                                          channels);
-       if (channels[0].local_address == NULL) {
-               TALLOC_FREE(session);
-               return NT_STATUS_NO_MEMORY;
-       }
-       channels[0].remote_address = tsocket_address_string(conn->remote_address,
-                                                           channels);
-       if (channels[0].remote_address == NULL) {
-               TALLOC_FREE(session);
-               return NT_STATUS_NO_MEMORY;
-       }
-       channels[0].remote_name = talloc_strdup(channels, conn->remote_hostname);
-       if (channels[0].remote_name == NULL) {
+       status = smbXsrv_session_add_channel(session, conn, &channel);
+       if (!NT_STATUS_IS_OK(status)) {
                TALLOC_FREE(session);
-               return NT_STATUS_NO_MEMORY;
+               return status;
        }
-       channels[0].signing_key = data_blob_null;
 
        ptr = session;
        val = make_tdb_data((uint8_t const *)&ptr, sizeof(ptr));
@@ -858,12 +1336,60 @@ NTSTATUS smbXsrv_session_create(struct smbXsrv_connection *conn,
        return NT_STATUS_OK;
 }
 
+NTSTATUS smbXsrv_session_add_channel(struct smbXsrv_session *session,
+                                    struct smbXsrv_connection *conn,
+                                    struct smbXsrv_channel_global0 **_c)
+{
+       struct smbXsrv_session_global0 *global = session->global;
+       struct smbXsrv_channel_global0 *c = NULL;
+
+       if (global->num_channels > 31) {
+               /*
+                * Windows 2012 and 2012R2 allow up to 32 channels
+                */
+               return NT_STATUS_INSUFFICIENT_RESOURCES;
+       }
+
+       c = talloc_realloc(global,
+                          global->channels,
+                          struct smbXsrv_channel_global0,
+                          global->num_channels + 1);
+       if (c == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       global->channels = c;
+
+       c = &global->channels[global->num_channels];
+       ZERO_STRUCTP(c);
+
+       c->server_id = messaging_server_id(conn->client->msg_ctx);
+       c->local_address = tsocket_address_string(conn->local_address,
+                                                 global->channels);
+       if (c->local_address == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       c->remote_address = tsocket_address_string(conn->remote_address,
+                                                  global->channels);
+       if (c->remote_address == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       c->remote_name = talloc_strdup(global->channels,
+                                      conn->remote_hostname);
+       if (c->remote_name == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       c->connection = conn;
+
+       global->num_channels += 1;
+
+       *_c = c;
+       return NT_STATUS_OK;
+}
+
 NTSTATUS smbXsrv_session_update(struct smbXsrv_session *session)
 {
        struct smbXsrv_session_table *table = session->table;
        NTSTATUS status;
-       uint8_t key_buf[SMBXSRV_SESSION_GLOBAL_TDB_KEY_SIZE];
-       TDB_DATA key;
 
        if (session->global->db_rec != NULL) {
                DEBUG(0, ("smbXsrv_session_update(0x%08x): "
@@ -872,18 +1398,11 @@ NTSTATUS smbXsrv_session_update(struct smbXsrv_session *session)
                return NT_STATUS_INTERNAL_ERROR;
        }
 
-       key = smbXsrv_session_global_id_to_key(
+       session->global->db_rec = smbXsrv_session_global_fetch_locked(
+                                       table->global.db_ctx,
                                        session->global->session_global_id,
-                                       key_buf);
-
-       session->global->db_rec = dbwrap_fetch_locked(table->global.db_ctx,
-                                                     session->global, key);
+                                       session->global /* TALLOC_CTX */);
        if (session->global->db_rec == NULL) {
-               DEBUG(0, ("smbXsrv_session_update(0x%08x): "
-                         "Failed to lock global key '%s'\n",
-                         session->global->session_global_id,
-                         hex_encode_talloc(talloc_tos(), key.dptr,
-                                           key.dsize)));
                return NT_STATUS_INTERNAL_DB_ERROR;
        }
 
@@ -911,12 +1430,225 @@ NTSTATUS smbXsrv_session_update(struct smbXsrv_session *session)
        return NT_STATUS_OK;
 }
 
+NTSTATUS smbXsrv_session_find_channel(const struct smbXsrv_session *session,
+                                     const struct smbXsrv_connection *conn,
+                                     struct smbXsrv_channel_global0 **_c)
+{
+       uint32_t i;
+
+       for (i=0; i < session->global->num_channels; i++) {
+               struct smbXsrv_channel_global0 *c = &session->global->channels[i];
+
+               if (c->connection == conn) {
+                       *_c = c;
+                       return NT_STATUS_OK;
+               }
+       }
+
+       return NT_STATUS_USER_SESSION_DELETED;
+}
+
+NTSTATUS smbXsrv_session_find_auth(const struct smbXsrv_session *session,
+                                  const struct smbXsrv_connection *conn,
+                                  NTTIME now,
+                                  struct smbXsrv_session_auth0 **_a)
+{
+       struct smbXsrv_session_auth0 *a;
+
+       for (a = session->pending_auth; a != NULL; a = a->next) {
+               if (a->connection == conn) {
+                       if (now != 0) {
+                               a->idle_time = now;
+                       }
+                       *_a = a;
+                       return NT_STATUS_OK;
+               }
+       }
+
+       return NT_STATUS_USER_SESSION_DELETED;
+}
+
+static int smbXsrv_session_auth0_destructor(struct smbXsrv_session_auth0 *a)
+{
+       if (a->session == NULL) {
+               return 0;
+       }
+
+       DLIST_REMOVE(a->session->pending_auth, a);
+       a->session = NULL;
+       return 0;
+}
+
+NTSTATUS smbXsrv_session_create_auth(struct smbXsrv_session *session,
+                                    struct smbXsrv_connection *conn,
+                                    NTTIME now,
+                                    uint8_t in_flags,
+                                    uint8_t in_security_mode,
+                                    struct smbXsrv_session_auth0 **_a)
+{
+       struct smbXsrv_session_auth0 *a;
+       NTSTATUS status;
+
+       status = smbXsrv_session_find_auth(session, conn, 0, &a);
+       if (NT_STATUS_IS_OK(status)) {
+               return NT_STATUS_INTERNAL_ERROR;
+       }
+
+       a = talloc_zero(session, struct smbXsrv_session_auth0);
+       if (a == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       a->session = session;
+       a->connection = conn;
+       a->in_flags = in_flags;
+       a->in_security_mode = in_security_mode;
+       a->creation_time = now;
+       a->idle_time = now;
+
+       if (conn->protocol >= PROTOCOL_SMB3_10) {
+               a->preauth = talloc(a, struct smbXsrv_preauth);
+               if (a->preauth == NULL) {
+                       TALLOC_FREE(session);
+                       return NT_STATUS_NO_MEMORY;
+               }
+               *a->preauth = conn->smb2.preauth;
+       }
+
+       talloc_set_destructor(a, smbXsrv_session_auth0_destructor);
+       DLIST_ADD_END(session->pending_auth, a);
+
+       *_a = a;
+       return NT_STATUS_OK;
+}
+
+struct smb2srv_session_shutdown_state {
+       struct tevent_queue *wait_queue;
+};
+
+static void smb2srv_session_shutdown_wait_done(struct tevent_req *subreq);
+
+struct tevent_req *smb2srv_session_shutdown_send(TALLOC_CTX *mem_ctx,
+                                       struct tevent_context *ev,
+                                       struct smbXsrv_session *session,
+                                       struct smbd_smb2_request *current_req)
+{
+       struct tevent_req *req;
+       struct smb2srv_session_shutdown_state *state;
+       struct tevent_req *subreq;
+       struct smbXsrv_connection *xconn = NULL;
+       size_t len = 0;
+
+       /*
+        * Make sure that no new request will be able to use this session.
+        */
+       session->status = NT_STATUS_USER_SESSION_DELETED;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct smb2srv_session_shutdown_state);
+       if (req == NULL) {
+               return NULL;
+       }
+
+       state->wait_queue = tevent_queue_create(state, "smb2srv_session_shutdown_queue");
+       if (tevent_req_nomem(state->wait_queue, req)) {
+               return tevent_req_post(req, ev);
+       }
+
+       for (xconn = session->client->connections; xconn != NULL; xconn = xconn->next) {
+               struct smbd_smb2_request *preq;
+
+               for (preq = xconn->smb2.requests; preq != NULL; preq = preq->next) {
+                       if (preq == current_req) {
+                               /* Can't cancel current request. */
+                               continue;
+                       }
+                       if (preq->session != session) {
+                               /* Request on different session. */
+                               continue;
+                       }
+
+                       if (!NT_STATUS_IS_OK(xconn->transport.status)) {
+                               preq->session = NULL;
+                               /*
+                                * If we no longer have a session we can't
+                                * sign or encrypt replies.
+                                */
+                               preq->do_signing = false;
+                               preq->do_encryption = false;
+                               preq->preauth = NULL;
+
+                               if (preq->subreq != NULL) {
+                                       tevent_req_cancel(preq->subreq);
+                               }
+                               continue;
+                       }
+
+                       /*
+                        * Never cancel anything in a compound
+                        * request. Way too hard to deal with
+                        * the result.
+                        */
+                       if (!preq->compound_related && preq->subreq != NULL) {
+                               tevent_req_cancel(preq->subreq);
+                       }
+
+                       /*
+                        * Now wait until the request is finished.
+                        *
+                        * We don't set a callback, as we just want to block the
+                        * wait queue and the talloc_free() of the request will
+                        * remove the item from the wait queue.
+                        */
+                       subreq = tevent_queue_wait_send(preq, ev, state->wait_queue);
+                       if (tevent_req_nomem(subreq, req)) {
+                               return tevent_req_post(req, ev);
+                       }
+               }
+       }
+
+       len = tevent_queue_length(state->wait_queue);
+       if (len == 0) {
+               tevent_req_done(req);
+               return tevent_req_post(req, ev);
+       }
+
+       /*
+        * Now we add our own waiter to the end of the queue,
+        * this way we get notified when all pending requests are finished
+        * and send to the socket.
+        */
+       subreq = tevent_queue_wait_send(state, ev, state->wait_queue);
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
+       }
+       tevent_req_set_callback(subreq, smb2srv_session_shutdown_wait_done, req);
+
+       return req;
+}
+
+static void smb2srv_session_shutdown_wait_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req =
+               tevent_req_callback_data(subreq,
+               struct tevent_req);
+
+       tevent_queue_wait_recv(subreq);
+       TALLOC_FREE(subreq);
+
+       tevent_req_done(req);
+}
+
+NTSTATUS smb2srv_session_shutdown_recv(struct tevent_req *req)
+{
+       return tevent_req_simple_recv_ntstatus(req);
+}
+
 NTSTATUS smbXsrv_session_logoff(struct smbXsrv_session *session)
 {
        struct smbXsrv_session_table *table;
        struct db_record *local_rec = NULL;
        struct db_record *global_rec = NULL;
-       struct smbXsrv_connection *conn;
+       struct smbd_server_connection *sconn = NULL;
        NTSTATUS status;
        NTSTATUS error = NT_STATUS_OK;
 
@@ -927,28 +1659,47 @@ NTSTATUS smbXsrv_session_logoff(struct smbXsrv_session *session)
        table = session->table;
        session->table = NULL;
 
-       conn = session->connection;
-       session->connection = NULL;
+       sconn = session->client->sconn;
+       session->client = NULL;
        session->status = NT_STATUS_USER_SESSION_DELETED;
 
+       if (session->compat) {
+               /*
+                * For SMB2 this is a bit redundant as files are also close
+                * below via smb2srv_tcon_disconnect_all() -> ... ->
+                * smbXsrv_tcon_disconnect() -> close_cnum() ->
+                * file_close_conn().
+                */
+               file_close_user(sconn, session->compat->vuid);
+       }
+
+       if (session->tcon_table != NULL) {
+               /*
+                * Note: We only have a tcon_table for SMB2.
+                */
+               status = smb2srv_tcon_disconnect_all(session);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(0, ("smbXsrv_session_logoff(0x%08x): "
+                                 "smb2srv_tcon_disconnect_all() failed: %s\n",
+                                 session->global->session_global_id,
+                                 nt_errstr(status)));
+                       error = status;
+               }
+       }
+
+       if (session->compat) {
+               invalidate_vuid(sconn, session->compat->vuid);
+               session->compat = NULL;
+       }
+
        global_rec = session->global->db_rec;
        session->global->db_rec = NULL;
        if (global_rec == NULL) {
-               uint8_t key_buf[SMBXSRV_SESSION_GLOBAL_TDB_KEY_SIZE];
-               TDB_DATA key;
-
-               key = smbXsrv_session_global_id_to_key(
+               global_rec = smbXsrv_session_global_fetch_locked(
+                                       table->global.db_ctx,
                                        session->global->session_global_id,
-                                       key_buf);
-
-               global_rec = dbwrap_fetch_locked(table->global.db_ctx,
-                                                session->global, key);
+                                       session->global /* TALLOC_CTX */);
                if (global_rec == NULL) {
-                       DEBUG(0, ("smbXsrv_session_logoff(0x%08x): "
-                                 "Failed to lock global key '%s'\n",
-                                 session->global->session_global_id,
-                                 hex_encode_talloc(global_rec, key.dptr,
-                                                   key.dsize)));
                        error = NT_STATUS_INTERNAL_ERROR;
                }
        }
@@ -971,20 +1722,11 @@ NTSTATUS smbXsrv_session_logoff(struct smbXsrv_session *session)
 
        local_rec = session->db_rec;
        if (local_rec == NULL) {
-               uint8_t key_buf[SMBXSRV_SESSION_LOCAL_TDB_KEY_SIZE];
-               TDB_DATA key;
-
-               key = smbXsrv_session_local_id_to_key(session->local_id,
-                                                     key_buf);
-
-               local_rec = dbwrap_fetch_locked(table->local.db_ctx,
-                                               session, key);
+               local_rec = smbXsrv_session_local_fetch_locked(
+                                               table->local.db_ctx,
+                                               session->local_id,
+                                               session /* TALLOC_CTX */);
                if (local_rec == NULL) {
-                       DEBUG(0, ("smbXsrv_session_logoff(0x%08x): "
-                                 "Failed to lock local key '%s'\n",
-                                 session->global->session_global_id,
-                                 hex_encode_talloc(local_rec, key.dptr,
-                                                   key.dsize)));
                        error = NT_STATUS_INTERNAL_ERROR;
                }
        }
@@ -1009,26 +1751,6 @@ NTSTATUS smbXsrv_session_logoff(struct smbXsrv_session *session)
        }
        session->db_rec = NULL;
 
-       if (session->compat) {
-               file_close_user(conn->sconn, session->compat->vuid);
-       }
-
-       if (conn->protocol >= PROTOCOL_SMB2_02) {
-               status = smb2srv_tcon_disconnect_all(session);
-               if (!NT_STATUS_IS_OK(status)) {
-                       DEBUG(0, ("smbXsrv_session_logoff(0x%08x): "
-                                 "smb2srv_tcon_disconnect_all() failed: %s\n",
-                                 session->global->session_global_id,
-                                 nt_errstr(status)));
-                       error = status;
-               }
-       }
-
-       if (session->compat) {
-               invalidate_vuid(conn->sconn, session->compat->vuid);
-               session->compat = NULL;
-       }
-
        return error;
 }
 
@@ -1040,9 +1762,9 @@ struct smbXsrv_session_logoff_all_state {
 static int smbXsrv_session_logoff_all_callback(struct db_record *local_rec,
                                               void *private_data);
 
-NTSTATUS smbXsrv_session_logoff_all(struct smbXsrv_connection *conn)
+NTSTATUS smbXsrv_session_logoff_all(struct smbXsrv_client *client)
 {
-       struct smbXsrv_session_table *table = conn->session_table;
+       struct smbXsrv_session_table *table = client->session_table;
        struct smbXsrv_session_logoff_all_state state;
        NTSTATUS status;
        int count = 0;
@@ -1100,7 +1822,8 @@ static int smbXsrv_session_logoff_all_callback(struct db_record *local_rec,
        session = talloc_get_type_abort(ptr, struct smbXsrv_session);
 
        session->db_rec = local_rec;
-       status = smbXsrv_session_logoff(session);
+
+       status = smbXsrv_session_clear_and_logoff(session);
        if (!NT_STATUS_IS_OK(status)) {
                if (NT_STATUS_IS_OK(state->first_status)) {
                        state->first_status = status;
@@ -1115,36 +1838,38 @@ static int smbXsrv_session_logoff_all_callback(struct db_record *local_rec,
 NTSTATUS smb1srv_session_table_init(struct smbXsrv_connection *conn)
 {
        /*
-        * Allow a range from 1..65534.
+        * Allow a range from 1..65534 with 65534 values.
         */
-       return smbXsrv_session_table_init(conn, 1, UINT16_MAX - 1);
+       return smbXsrv_session_table_init(conn, 1, UINT16_MAX - 1,
+                                         UINT16_MAX - 1);
 }
 
 NTSTATUS smb1srv_session_lookup(struct smbXsrv_connection *conn,
                                uint16_t vuid, NTTIME now,
                                struct smbXsrv_session **session)
 {
-       struct smbXsrv_session_table *table = conn->session_table;
+       struct smbXsrv_session_table *table = conn->client->session_table;
        uint32_t local_id = vuid;
 
-       return smbXsrv_session_local_lookup(table, local_id, now, session);
+       return smbXsrv_session_local_lookup(table, conn, local_id, now,
+                                           session);
 }
 
 NTSTATUS smb2srv_session_table_init(struct smbXsrv_connection *conn)
 {
        /*
-        * For now use the same range as SMB1.
-        *
-        * Allow a range from 1..65534.
+        * Allow a range from 1..4294967294 with 65534 (same as SMB1) values.
         */
-       return smbXsrv_session_table_init(conn, 1, UINT16_MAX - 1);
+       return smbXsrv_session_table_init(conn, 1, UINT32_MAX - 1,
+                                         UINT16_MAX - 1);
 }
 
-NTSTATUS smb2srv_session_lookup(struct smbXsrv_connection *conn,
-                               uint64_t session_id, NTTIME now,
-                               struct smbXsrv_session **session)
+static NTSTATUS smb2srv_session_lookup_raw(struct smbXsrv_session_table *table,
+                                          /* conn: optional */
+                                          struct smbXsrv_connection *conn,
+                                          uint64_t session_id, NTTIME now,
+                                          struct smbXsrv_session **session)
 {
-       struct smbXsrv_session_table *table = conn->session_table;
        uint32_t local_id = session_id & UINT32_MAX;
        uint64_t local_zeros = session_id & 0xFFFFFFFF00000000LLU;
 
@@ -1152,5 +1877,96 @@ NTSTATUS smb2srv_session_lookup(struct smbXsrv_connection *conn,
                return NT_STATUS_USER_SESSION_DELETED;
        }
 
-       return smbXsrv_session_local_lookup(table, local_id, now, session);
+       return smbXsrv_session_local_lookup(table, conn, local_id, now,
+                                           session);
+}
+
+NTSTATUS smb2srv_session_lookup_conn(struct smbXsrv_connection *conn,
+                                    uint64_t session_id, NTTIME now,
+                                    struct smbXsrv_session **session)
+{
+       struct smbXsrv_session_table *table = conn->client->session_table;
+       return smb2srv_session_lookup_raw(table, conn, session_id, now,
+                                         session);
+}
+
+NTSTATUS smb2srv_session_lookup_client(struct smbXsrv_client *client,
+                                      uint64_t session_id, NTTIME now,
+                                      struct smbXsrv_session **session)
+{
+       struct smbXsrv_session_table *table = client->session_table;
+       return smb2srv_session_lookup_raw(table, NULL, session_id, now,
+                                         session);
+}
+
+struct smbXsrv_session_global_traverse_state {
+       int (*fn)(struct smbXsrv_session_global0 *, void *);
+       void *private_data;
+};
+
+static int smbXsrv_session_global_traverse_fn(struct db_record *rec, void *data)
+{
+       int ret = -1;
+       struct smbXsrv_session_global_traverse_state *state =
+               (struct smbXsrv_session_global_traverse_state*)data;
+       TDB_DATA key = dbwrap_record_get_key(rec);
+       TDB_DATA val = dbwrap_record_get_value(rec);
+       DATA_BLOB blob = data_blob_const(val.dptr, val.dsize);
+       struct smbXsrv_session_globalB global_blob;
+       enum ndr_err_code ndr_err;
+       TALLOC_CTX *frame = talloc_stackframe();
+
+       ndr_err = ndr_pull_struct_blob(&blob, frame, &global_blob,
+                       (ndr_pull_flags_fn_t)ndr_pull_smbXsrv_session_globalB);
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               DEBUG(1,("Invalid record in smbXsrv_session_global.tdb:"
+                        "key '%s' ndr_pull_struct_blob - %s\n",
+                        hex_encode_talloc(frame, key.dptr, key.dsize),
+                        ndr_errstr(ndr_err)));
+               goto done;
+       }
+
+       if (global_blob.version != SMBXSRV_VERSION_0) {
+               DEBUG(1,("Invalid record in smbXsrv_session_global.tdb:"
+                        "key '%s' unsupported version - %d\n",
+                        hex_encode_talloc(frame, key.dptr, key.dsize),
+                        (int)global_blob.version));
+               goto done;
+       }
+
+       global_blob.info.info0->db_rec = rec;
+       ret = state->fn(global_blob.info.info0, state->private_data);
+done:
+       TALLOC_FREE(frame);
+       return ret;
+}
+
+NTSTATUS smbXsrv_session_global_traverse(
+                       int (*fn)(struct smbXsrv_session_global0 *, void *),
+                       void *private_data)
+{
+
+       NTSTATUS status;
+       int count = 0;
+       struct smbXsrv_session_global_traverse_state state = {
+               .fn = fn,
+               .private_data = private_data,
+       };
+
+       become_root();
+       status = smbXsrv_session_global_init(NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               unbecome_root();
+               DEBUG(0, ("Failed to initialize session_global: %s\n",
+                         nt_errstr(status)));
+               return status;
+       }
+
+       status = dbwrap_traverse_read(smbXsrv_session_global_db_ctx,
+                                     smbXsrv_session_global_traverse_fn,
+                                     &state,
+                                     &count);
+       unbecome_root();
+
+       return status;
 }