s3:smb2_server: allow reauthentication without signing
[obnox/samba/samba-obnox.git] / source3 / smbd / smb2_sesssetup.c
index ee588b06fe840d0be68f468e5086fbd3d3729923..2f58e44f55a0a86b8c9da2269a8525dc250f3e5c 100644 (file)
@@ -49,7 +49,6 @@ NTSTATUS smbd_smb2_request_process_sesssetup(struct smbd_smb2_request *smb2req)
 {
        const uint8_t *inhdr;
        const uint8_t *inbody;
-       int i = smb2req->current_idx;
        uint64_t in_session_id;
        uint8_t in_flags;
        uint8_t in_security_mode;
@@ -64,8 +63,8 @@ NTSTATUS smbd_smb2_request_process_sesssetup(struct smbd_smb2_request *smb2req)
        if (!NT_STATUS_IS_OK(status)) {
                return smbd_smb2_request_error(smb2req, status);
        }
-       inhdr = (const uint8_t *)smb2req->in.vector[i+0].iov_base;
-       inbody = (const uint8_t *)smb2req->in.vector[i+1].iov_base;
+       inhdr = SMBD_SMB2_IN_HDR_PTR(smb2req);
+       inbody = SMBD_SMB2_IN_BODY_PTR(smb2req);
 
        in_session_id = BVAL(inhdr, SMB2_HDR_SESSION_ID);
 
@@ -77,15 +76,15 @@ NTSTATUS smbd_smb2_request_process_sesssetup(struct smbd_smb2_request *smb2req)
        in_security_length = SVAL(inbody, 0x0E);
        in_previous_session_id = BVAL(inbody, 0x10);
 
-       if (in_security_offset != (SMB2_HDR_BODY + smb2req->in.vector[i+1].iov_len)) {
+       if (in_security_offset != (SMB2_HDR_BODY + SMBD_SMB2_IN_BODY_LEN(smb2req))) {
                return smbd_smb2_request_error(smb2req, NT_STATUS_INVALID_PARAMETER);
        }
 
-       if (in_security_length > smb2req->in.vector[i+2].iov_len) {
+       if (in_security_length > SMBD_SMB2_IN_DYN_LEN(smb2req)) {
                return smbd_smb2_request_error(smb2req, NT_STATUS_INVALID_PARAMETER);
        }
 
-       in_security_buffer.data = (uint8_t *)smb2req->in.vector[i+2].iov_base;
+       in_security_buffer.data = SMBD_SMB2_IN_DYN_PTR(smb2req);
        in_security_buffer.length = in_security_length;
 
        subreq = smbd_smb2_session_setup_send(smb2req,
@@ -109,12 +108,11 @@ static void smbd_smb2_request_sesssetup_done(struct tevent_req *subreq)
        struct smbd_smb2_request *smb2req =
                tevent_req_callback_data(subreq,
                struct smbd_smb2_request);
-       int i = smb2req->current_idx;
        uint8_t *outhdr;
        DATA_BLOB outbody;
        DATA_BLOB outdyn;
-       uint16_t out_session_flags;
-       uint64_t out_session_id;
+       uint16_t out_session_flags = 0;
+       uint64_t out_session_id = 0;
        uint16_t out_security_offset;
        DATA_BLOB out_security_buffer = data_blob_null;
        NTSTATUS status;
@@ -131,7 +129,7 @@ static void smbd_smb2_request_sesssetup_done(struct tevent_req *subreq)
                status = nt_status_squash(status);
                error = smbd_smb2_request_error(smb2req, status);
                if (!NT_STATUS_IS_OK(error)) {
-                       smbd_server_connection_terminate(smb2req->sconn,
+                       smbd_server_connection_terminate(smb2req->xconn,
                                                         nt_errstr(error));
                        return;
                }
@@ -140,13 +138,13 @@ static void smbd_smb2_request_sesssetup_done(struct tevent_req *subreq)
 
        out_security_offset = SMB2_HDR_BODY + 0x08;
 
-       outhdr = (uint8_t *)smb2req->out.vector[i].iov_base;
+       outhdr = SMBD_SMB2_OUT_HDR_PTR(smb2req);
 
-       outbody = data_blob_talloc(smb2req->out.vector, NULL, 0x08);
+       outbody = smbd_smb2_generate_outbody(smb2req, 0x08);
        if (outbody.data == NULL) {
                error = smbd_smb2_request_error(smb2req, NT_STATUS_NO_MEMORY);
                if (!NT_STATUS_IS_OK(error)) {
-                       smbd_server_connection_terminate(smb2req->sconn,
+                       smbd_server_connection_terminate(smb2req->xconn,
                                                         nt_errstr(error));
                        return;
                }
@@ -168,7 +166,7 @@ static void smbd_smb2_request_sesssetup_done(struct tevent_req *subreq)
        error = smbd_smb2_request_done_ex(smb2req, status, outbody, &outdyn,
                                           __location__);
        if (!NT_STATUS_IS_OK(error)) {
-               smbd_server_connection_terminate(smb2req->sconn,
+               smbd_server_connection_terminate(smb2req->xconn,
                                                 nt_errstr(error));
                return;
        }
@@ -185,13 +183,17 @@ static NTSTATUS smbd_smb2_auth_generic_return(struct smbXsrv_session *session,
        bool guest = false;
        uint8_t session_key[16];
        struct smbXsrv_session *x = session;
-       struct smbXsrv_connection *conn = session->connection;
+       struct smbXsrv_connection *xconn = smb2req->xconn;
 
        if ((in_security_mode & SMB2_NEGOTIATE_SIGNING_REQUIRED) ||
            lp_server_signing() == SMB_SIGNING_REQUIRED) {
                x->global->signing_required = true;
        }
 
+       if (lp_smb_encrypt(-1) == SMB_SIGNING_REQUIRED) {
+               x->global->encryption_required = true;
+       }
+
        if (security_session_user_level(session_info, NULL) < SECURITY_USER) {
                /* we map anonymous to guest internally */
                *out_session_flags |= SMB2_SESSION_FLAG_IS_GUEST;
@@ -201,6 +203,24 @@ static NTSTATUS smbd_smb2_auth_generic_return(struct smbXsrv_session *session,
                guest = true;
        }
 
+       if (guest && x->global->encryption_required) {
+               DEBUG(1,("reject guest session as encryption is required\n"));
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
+       if (xconn->smb2.server.cipher == 0) {
+               if (x->global->encryption_required) {
+                       DEBUG(1,("reject session with dialect[0x%04X] "
+                                "as encryption is required\n",
+                                xconn->smb2.server.dialect));
+                       return NT_STATUS_ACCESS_DENIED;
+               }
+       }
+
+       if (x->global->encryption_required) {
+               *out_session_flags |= SMB2_SESSION_FLAG_ENCRYPT_DATA;
+       }
+
        ZERO_STRUCT(session_key);
        memcpy(session_key, session_info->session_key.data,
               MIN(session_info->session_key.length, sizeof(session_key)));
@@ -210,11 +230,10 @@ static NTSTATUS smbd_smb2_auth_generic_return(struct smbXsrv_session *session,
                                                  sizeof(session_key));
        if (x->global->signing_key.data == NULL) {
                ZERO_STRUCT(session_key);
-               TALLOC_FREE(session);
                return NT_STATUS_NO_MEMORY;
        }
 
-       if (conn->protocol >= PROTOCOL_SMB2_24) {
+       if (xconn->protocol >= PROTOCOL_SMB2_24) {
                const DATA_BLOB label = data_blob_string_const_null("SMB2AESCMAC");
                const DATA_BLOB context = data_blob_string_const_null("SmbSign");
 
@@ -224,15 +243,53 @@ static NTSTATUS smbd_smb2_auth_generic_return(struct smbXsrv_session *session,
                                    x->global->signing_key.data);
        }
 
+       if (xconn->protocol >= PROTOCOL_SMB2_24) {
+               const DATA_BLOB label = data_blob_string_const_null("SMB2AESCCM");
+               const DATA_BLOB context = data_blob_string_const_null("ServerIn ");
+
+               x->global->decryption_key = data_blob_talloc(x->global,
+                                                            session_key,
+                                                            sizeof(session_key));
+               if (x->global->decryption_key.data == NULL) {
+                       ZERO_STRUCT(session_key);
+                       return NT_STATUS_NO_MEMORY;
+               }
+
+               smb2_key_derivation(session_key, sizeof(session_key),
+                                   label.data, label.length,
+                                   context.data, context.length,
+                                   x->global->decryption_key.data);
+       }
+
+       if (xconn->protocol >= PROTOCOL_SMB2_24) {
+               const DATA_BLOB label = data_blob_string_const_null("SMB2AESCCM");
+               const DATA_BLOB context = data_blob_string_const_null("ServerOut");
+
+               x->global->encryption_key = data_blob_talloc(x->global,
+                                                            session_key,
+                                                            sizeof(session_key));
+               if (x->global->encryption_key.data == NULL) {
+                       ZERO_STRUCT(session_key);
+                       return NT_STATUS_NO_MEMORY;
+               }
+
+               smb2_key_derivation(session_key, sizeof(session_key),
+                                   label.data, label.length,
+                                   context.data, context.length,
+                                   x->global->encryption_key.data);
+
+               generate_random_buffer((uint8_t *)&x->nonce_high, sizeof(x->nonce_high));
+               x->nonce_low = 1;
+       }
+
        x->global->application_key = data_blob_dup_talloc(x->global,
                                                x->global->signing_key);
        if (x->global->application_key.data == NULL) {
                ZERO_STRUCT(session_key);
-               TALLOC_FREE(session);
                return NT_STATUS_NO_MEMORY;
        }
 
-       if (conn->protocol >= PROTOCOL_SMB2_24) {
+       if (xconn->protocol >= PROTOCOL_SMB2_24) {
                const DATA_BLOB label = data_blob_string_const_null("SMB2APP");
                const DATA_BLOB context = data_blob_string_const_null("SmbRpc");
 
@@ -246,7 +303,6 @@ static NTSTATUS smbd_smb2_auth_generic_return(struct smbXsrv_session *session,
        x->global->channels[0].signing_key = data_blob_dup_talloc(x->global->channels,
                                                x->global->signing_key);
        if (x->global->channels[0].signing_key.data == NULL) {
-               TALLOC_FREE(session);
                return NT_STATUS_NO_MEMORY;
        }
 
@@ -254,13 +310,11 @@ static NTSTATUS smbd_smb2_auth_generic_return(struct smbXsrv_session *session,
        session_info->session_key = data_blob_dup_talloc(session_info,
                                                x->global->application_key);
        if (session_info->session_key.data == NULL) {
-               TALLOC_FREE(session);
                return NT_STATUS_NO_MEMORY;
        }
 
        session->compat = talloc_zero(session, struct user_struct);
        if (session->compat == NULL) {
-               TALLOC_FREE(session);
                return NT_STATUS_NO_MEMORY;
        }
        session->compat->session = session;
@@ -276,14 +330,6 @@ static NTSTATUS smbd_smb2_auth_generic_return(struct smbXsrv_session *session,
                        register_homes_share(session_info->unix_info->unix_name);
        }
 
-       if (!session_claim(smb2req->sconn, session->compat)) {
-               DEBUG(1, ("smb2: Failed to claim session "
-                       "for vuid=%llu\n",
-                       (unsigned long long)session->compat->vuid));
-               TALLOC_FREE(session);
-               return NT_STATUS_LOGON_FAILURE;
-       }
-
        set_current_user_info(session_info->unix_info->sanitized_username,
                              session_info->unix_info->unix_name,
                              session_info->info->domain_name);
@@ -295,14 +341,21 @@ static NTSTATUS smbd_smb2_auth_generic_return(struct smbXsrv_session *session,
        session->global->auth_session_info_seqnum += 1;
        session->global->channels[0].auth_session_info_seqnum =
                session->global->auth_session_info_seqnum;
+       session->global->auth_time = timeval_to_nttime(&smb2req->request_time);
        session->global->expiration_time = gensec_expire_time(session->gensec);
 
+       if (!session_claim(session)) {
+               DEBUG(1, ("smb2: Failed to claim session "
+                       "for vuid=%llu\n",
+                       (unsigned long long)session->compat->vuid));
+               return NT_STATUS_LOGON_FAILURE;
+       }
+
        status = smbXsrv_session_update(session);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(0, ("smb2: Failed to update session for vuid=%llu - %s\n",
                          (unsigned long long)session->compat->vuid,
                          nt_errstr(status)));
-               TALLOC_FREE(session);
                return NT_STATUS_LOGON_FAILURE;
        }
 
@@ -330,13 +383,11 @@ static NTSTATUS smbd_smb2_reauth_generic_return(struct smbXsrv_session *session,
 {
        NTSTATUS status;
        struct smbXsrv_session *x = session;
-       struct smbXsrv_connection *conn = session->connection;
 
        data_blob_clear_free(&session_info->session_key);
        session_info->session_key = data_blob_dup_talloc(session_info,
                                                x->global->application_key);
        if (session_info->session_key.data == NULL) {
-               TALLOC_FREE(session);
                return NT_STATUS_NO_MEMORY;
        }
 
@@ -358,6 +409,7 @@ static NTSTATUS smbd_smb2_reauth_generic_return(struct smbXsrv_session *session,
        session->global->auth_session_info_seqnum += 1;
        session->global->channels[0].auth_session_info_seqnum =
                session->global->auth_session_info_seqnum;
+       session->global->auth_time = timeval_to_nttime(&smb2req->request_time);
        session->global->expiration_time = gensec_expire_time(session->gensec);
 
        status = smbXsrv_session_update(session);
@@ -365,20 +417,14 @@ static NTSTATUS smbd_smb2_reauth_generic_return(struct smbXsrv_session *session,
                DEBUG(0, ("smb2: Failed to update session for vuid=%llu - %s\n",
                          (unsigned long long)session->compat->vuid,
                          nt_errstr(status)));
-               TALLOC_FREE(session);
                return NT_STATUS_LOGON_FAILURE;
        }
 
-       conn_clear_vuid_caches(conn->sconn, session->compat->vuid);
+       conn_clear_vuid_caches(smb2req->sconn, session->compat->vuid);
 
-       /*
-        * we attach the session to the request
-        * so that the response can be signed
-        */
-       smb2req->session = session;
-       smb2req->do_signing = true;
-
-       global_client_caps |= (CAP_LEVEL_II_OPLOCKS|CAP_STATUS32);
+       if (security_session_user_level(session_info, NULL) >= SECURITY_USER) {
+               smb2req->do_signing = true;
+       }
 
        *out_session_id = session->global->session_wire_id;
 
@@ -398,19 +444,93 @@ struct smbd_smb2_session_setup_state {
        uint16_t out_session_flags;
        DATA_BLOB out_security_buffer;
        uint64_t out_session_id;
+       /* The following pointer is owned by state->session. */
+       struct smbd_smb2_session_setup_state **pp_self_ref;
 };
 
+static int pp_self_ref_destructor(struct smbd_smb2_session_setup_state **pp_state)
+{
+       (*pp_state)->session = NULL;
+       /*
+        * To make things clearer, ensure the pp_self_ref
+        * pointer is nulled out. We're never going to
+        * access this again.
+        */
+       (*pp_state)->pp_self_ref = NULL;
+       return 0;
+}
+
 static int smbd_smb2_session_setup_state_destructor(struct smbd_smb2_session_setup_state *state)
 {
+       struct smbXsrv_connection *xconn;
+       struct smbd_smb2_request *preq;
+
+       /*
+        * If state->session is not NULL,
+        * we move the session from the session table to the request on failure
+        * so that the error response can be correctly signed, but the session
+        * is then really deleted when the request is done.
+        */
+
+       if (state->session == NULL) {
+               return 0;
+       }
+
+       state->session->status = NT_STATUS_USER_SESSION_DELETED;
+       state->smb2req->session = talloc_move(state->smb2req, &state->session);
+
        /*
-        * if state->session is not NULL,
-        * we remove the session on failure
+        * We own the session now - we don't need the
+        * tag talloced on session that keeps track of session independently.
         */
-       TALLOC_FREE(state->session);
+       TALLOC_FREE(state->pp_self_ref);
+
+       /*
+        * We've made this session owned by the current request.
+        * Ensure that any outstanding requests don't also refer
+        * to it.
+        */
+       xconn = state->smb2req->xconn;
+
+       for (preq = xconn->smb2.requests; preq != NULL; preq = preq->next) {
+               if (preq == state->smb2req) {
+                       continue;
+               }
+               if (preq->session == state->smb2req->session) {
+                       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;
+               }
+       }
+
        return 0;
 }
 
 static void smbd_smb2_session_setup_gensec_done(struct tevent_req *subreq);
+static void smbd_smb2_session_setup_previous_done(struct tevent_req *subreq);
+static void smbd_smb2_session_setup_auth_return(struct tevent_req *req);
+
+/************************************************************************
+ We have to tag the state->session pointer with memory talloc'ed
+ on it to ensure it gets NULL'ed out if the underlying struct smbXsrv_session
+ is deleted by shutdown whilst this request is in flight.
+************************************************************************/
+
+static NTSTATUS tag_state_session_ptr(struct smbd_smb2_session_setup_state *state)
+{
+       state->pp_self_ref = talloc_zero(state->session,
+                       struct smbd_smb2_session_setup_state *);
+       if (state->pp_self_ref == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       *state->pp_self_ref = state;
+       talloc_set_destructor(state->pp_self_ref, pp_self_ref_destructor);
+       return NT_STATUS_OK;
+}
 
 static struct tevent_req *smbd_smb2_session_setup_send(TALLOC_CTX *mem_ctx,
                                        struct tevent_context *ev,
@@ -440,19 +560,36 @@ static struct tevent_req *smbd_smb2_session_setup_send(TALLOC_CTX *mem_ctx,
        state->in_previous_session_id = in_previous_session_id;
        state->in_security_buffer = in_security_buffer;
 
+       if (in_flags & SMB2_SESSION_FLAG_BINDING) {
+               if (smb2req->xconn->protocol < PROTOCOL_SMB2_22) {
+                       tevent_req_nterror(req, NT_STATUS_REQUEST_NOT_ACCEPTED);
+                       return tevent_req_post(req, ev);
+               }
+
+               /*
+                * We do not support multi channel.
+                */
+               tevent_req_nterror(req, NT_STATUS_NOT_SUPPORTED);
+               return tevent_req_post(req, ev);
+       }
+
        talloc_set_destructor(state, smbd_smb2_session_setup_state_destructor);
 
        if (state->in_session_id == 0) {
                /* create a new session */
-               status = smbXsrv_session_create(state->smb2req->sconn->conn,
+               status = smbXsrv_session_create(state->smb2req->xconn,
                                                now, &state->session);
                if (tevent_req_nterror(req, status)) {
                        return tevent_req_post(req, ev);
                }
        } else {
-               status = smb2srv_session_lookup(state->smb2req->sconn->conn,
-                                               state->in_session_id, now,
-                                               &state->session);
+               if (smb2req->session == NULL) {
+                       tevent_req_nterror(req, NT_STATUS_USER_SESSION_DELETED);
+                       return tevent_req_post(req, ev);
+               }
+
+               state->session = smb2req->session;
+               status = state->session->status;
                if (NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_SESSION_EXPIRED)) {
                        status = NT_STATUS_OK;
                }
@@ -467,9 +604,14 @@ static struct tevent_req *smbd_smb2_session_setup_send(TALLOC_CTX *mem_ctx,
                }
        }
 
+       status = tag_state_session_ptr(state);
+       if (tevent_req_nterror(req, status)) {
+               return tevent_req_post(req, ev);
+       }
+
        if (state->session->gensec == NULL) {
                status = auth_generic_prepare(state->session,
-                                             state->session->connection->remote_address,
+                                             state->smb2req->xconn->remote_address,
                                              &state->session->gensec);
                if (tevent_req_nterror(req, status)) {
                        return tevent_req_post(req, ev);
@@ -523,6 +665,7 @@ static void smbd_smb2_session_setup_gensec_done(struct tevent_req *subreq)
                state->out_session_id = state->session->global->session_wire_id;
                /* we want to keep the session */
                state->session = NULL;
+               TALLOC_FREE(state->pp_self_ref);
                tevent_req_nterror(req, status);
                return;
        }
@@ -534,6 +677,50 @@ static void smbd_smb2_session_setup_gensec_done(struct tevent_req *subreq)
                return;
        }
 
+       if ((state->in_previous_session_id != 0) &&
+            (state->session->global->session_wire_id !=
+             state->in_previous_session_id))
+       {
+               subreq = smb2srv_session_close_previous_send(state, state->ev,
+                                               state->smb2req->xconn,
+                                               state->session_info,
+                                               state->in_previous_session_id,
+                                               state->session->global->session_wire_id);
+               if (tevent_req_nomem(subreq, req)) {
+                       return;
+               }
+               tevent_req_set_callback(subreq,
+                                       smbd_smb2_session_setup_previous_done,
+                                       req);
+               return;
+       }
+
+       smbd_smb2_session_setup_auth_return(req);
+}
+
+static void smbd_smb2_session_setup_previous_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req =
+               tevent_req_callback_data(subreq,
+               struct tevent_req);
+       NTSTATUS status;
+
+       status = smb2srv_session_close_previous_recv(subreq);
+       TALLOC_FREE(subreq);
+       if (tevent_req_nterror(req, status)) {
+               return;
+       }
+
+       smbd_smb2_session_setup_auth_return(req);
+}
+
+static void smbd_smb2_session_setup_auth_return(struct tevent_req *req)
+{
+       struct smbd_smb2_session_setup_state *state =
+               tevent_req_data(req,
+               struct smbd_smb2_session_setup_state);
+       NTSTATUS status;
+
        if (state->session->global->auth_session_info != NULL) {
                status = smbd_smb2_reauth_generic_return(state->session,
                                                         state->smb2req,
@@ -545,6 +732,7 @@ static void smbd_smb2_session_setup_gensec_done(struct tevent_req *subreq)
                }
                /* we want to keep the session */
                state->session = NULL;
+               TALLOC_FREE(state->pp_self_ref);
                tevent_req_done(req);
                return;
        }
@@ -561,6 +749,7 @@ static void smbd_smb2_session_setup_gensec_done(struct tevent_req *subreq)
 
        /* we want to keep the session */
        state->session = NULL;
+       TALLOC_FREE(state->pp_self_ref);
        tevent_req_done(req);
        return;
 }
@@ -594,44 +783,191 @@ static NTSTATUS smbd_smb2_session_setup_recv(struct tevent_req *req,
        return status;
 }
 
+static struct tevent_req *smbd_smb2_logoff_send(TALLOC_CTX *mem_ctx,
+                                       struct tevent_context *ev,
+                                       struct smbd_smb2_request *smb2req);
+static NTSTATUS smbd_smb2_logoff_recv(struct tevent_req *req);
+static void smbd_smb2_request_logoff_done(struct tevent_req *subreq);
+
 NTSTATUS smbd_smb2_request_process_logoff(struct smbd_smb2_request *req)
 {
        NTSTATUS status;
-       DATA_BLOB outbody;
+       struct tevent_req *subreq = NULL;
 
        status = smbd_smb2_request_verify_sizes(req, 0x04);
        if (!NT_STATUS_IS_OK(status)) {
                return smbd_smb2_request_error(req, status);
        }
 
+       subreq = smbd_smb2_logoff_send(req, req->sconn->ev_ctx, req);
+       if (subreq == NULL) {
+               return smbd_smb2_request_error(req, NT_STATUS_NO_MEMORY);
+       }
+       tevent_req_set_callback(subreq, smbd_smb2_request_logoff_done, req);
+
        /*
-        * TODO: cancel all outstanding requests on the session
+        * Wait a long time before going async on this to allow
+        * requests we're waiting on to finish. Set timeout to 10 secs.
         */
-       status = smbXsrv_session_logoff(req->session);
+       return smbd_smb2_request_pending_queue(req, subreq, 10000000);
+}
+
+static void smbd_smb2_request_logoff_done(struct tevent_req *subreq)
+{
+       struct smbd_smb2_request *smb2req =
+               tevent_req_callback_data(subreq,
+               struct smbd_smb2_request);
+       DATA_BLOB outbody;
+       NTSTATUS status;
+       NTSTATUS error;
+
+       status = smbd_smb2_logoff_recv(subreq);
+       TALLOC_FREE(subreq);
        if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0, ("smbd_smb2_request_process_logoff: "
-                         "smbXsrv_session_logoff() failed: %s\n",
-                         nt_errstr(status)));
+               error = smbd_smb2_request_error(smb2req, status);
+               if (!NT_STATUS_IS_OK(error)) {
+                       smbd_server_connection_terminate(smb2req->xconn,
+                                                       nt_errstr(error));
+                       return;
+               }
+               return;
+       }
+
+       outbody = smbd_smb2_generate_outbody(smb2req, 0x04);
+       if (outbody.data == NULL) {
+               error = smbd_smb2_request_error(smb2req, NT_STATUS_NO_MEMORY);
+               if (!NT_STATUS_IS_OK(error)) {
+                       smbd_server_connection_terminate(smb2req->xconn,
+                                                       nt_errstr(error));
+                       return;
+               }
+               return;
+       }
+
+       SSVAL(outbody.data, 0x00, 0x04);        /* struct size */
+       SSVAL(outbody.data, 0x02, 0);           /* reserved */
+
+       error = smbd_smb2_request_done(smb2req, outbody, NULL);
+       if (!NT_STATUS_IS_OK(error)) {
+               smbd_server_connection_terminate(smb2req->xconn,
+                                               nt_errstr(error));
+               return;
+       }
+}
+
+struct smbd_smb2_logout_state {
+       struct smbd_smb2_request *smb2req;
+       struct tevent_queue *wait_queue;
+};
+
+static void smbd_smb2_logoff_wait_done(struct tevent_req *subreq);
+
+static struct tevent_req *smbd_smb2_logoff_send(TALLOC_CTX *mem_ctx,
+                                       struct tevent_context *ev,
+                                       struct smbd_smb2_request *smb2req)
+{
+       struct tevent_req *req;
+       struct smbd_smb2_logout_state *state;
+       struct tevent_req *subreq;
+       struct smbd_smb2_request *preq;
+       struct smbXsrv_connection *xconn = smb2req->xconn;
+
+       req = tevent_req_create(mem_ctx, &state,
+                       struct smbd_smb2_logout_state);
+       if (req == NULL) {
+               return NULL;
+       }
+       state->smb2req = smb2req;
+
+       state->wait_queue = tevent_queue_create(state, "logoff_wait_queue");
+       if (tevent_req_nomem(state->wait_queue, req)) {
+               return tevent_req_post(req, ev);
+       }
+
+       /*
+        * Make sure that no new request will be able to use this session.
+        */
+       smb2req->session->status = NT_STATUS_USER_SESSION_DELETED;
+
+       for (preq = xconn->smb2.requests; preq != NULL; preq = preq->next) {
+               if (preq == smb2req) {
+                       /* Can't cancel current request. */
+                       continue;
+               }
+               if (preq->session != smb2req->session) {
+                       /* Request on different session. */
+                       continue;
+               }
+
                /*
-                * If we hit this case, there is something completely
-                * wrong, so we better disconnect the transport connection.
+                * Never cancel anything in a compound
+                * request. Way too hard to deal with
+                * the result.
                 */
-               return status;
+               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);
+               }
        }
 
        /*
-        * we may need to sign the response, so we need to keep
-        * the session until the response is sent to the wire.
+        * 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.
         */
-       talloc_steal(req, req->session);
+       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, smbd_smb2_logoff_wait_done, req);
 
-       outbody = data_blob_talloc(req->out.vector, NULL, 0x04);
-       if (outbody.data == NULL) {
-               return smbd_smb2_request_error(req, NT_STATUS_NO_MEMORY);
+       return req;
+}
+
+static void smbd_smb2_logoff_wait_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct smbd_smb2_logout_state *state = tevent_req_data(
+               req, struct smbd_smb2_logout_state);
+       NTSTATUS status;
+
+       tevent_queue_wait_recv(subreq);
+       TALLOC_FREE(subreq);
+
+       /*
+        * As we've been awoken, we may have changed
+        * uid in the meantime. Ensure we're still
+        * root (SMB2_OP_LOGOFF has .as_root = true).
+        */
+       change_to_root_user();
+
+       status = smbXsrv_session_logoff(state->smb2req->session);
+       if (tevent_req_nterror(req, status)) {
+               return;
        }
 
-       SSVAL(outbody.data, 0x00, 0x04);        /* struct size */
-       SSVAL(outbody.data, 0x02, 0);           /* reserved */
+       /*
+        * we may need to sign the response, so we need to keep
+        * the session until the response is sent to the wire.
+        */
+       talloc_steal(state->smb2req, state->smb2req->session);
+
+       tevent_req_done(req);
+}
 
-       return smbd_smb2_request_done(req, outbody, NULL);
+static NTSTATUS smbd_smb2_logoff_recv(struct tevent_req *req)
+{
+       return tevent_req_simple_recv_ntstatus(req);
 }