s3-auth Move map to guest to directly after the check_password calls
[amitay/samba.git] / source3 / smbd / smb2_sesssetup.c
index 493e74802d501710948349e9bdc235065a878a74..511df8639dd957bfd9b3845e4f7ee6838a0763b0 100644 (file)
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 #include "../libcli/auth/spnego.h"
 #include "../libcli/auth/ntlmssp.h"
+#include "ntlmssp_wrap.h"
+#include "../librpc/gen_ndr/krb5pac.h"
+#include "libads/kerberos_proto.h"
+#include "../lib/util/asn1.h"
+#include "auth.h"
+#include "../lib/tsocket/tsocket.h"
+#include "../libcli/security/security.h"
 
 static NTSTATUS smbd_smb2_session_setup(struct smbd_smb2_request *smb2req,
                                        uint64_t in_session_id,
@@ -143,26 +151,6 @@ static int smbd_smb2_session_destructor(struct smbd_smb2_session *session)
        return 0;
 }
 
-static NTSTATUS setup_ntlmssp_server_info(struct smbd_smb2_session *session,
-                               NTSTATUS status)
-{
-       if (NT_STATUS_IS_OK(status)) {
-               status = auth_ntlmssp_server_info(session,
-                               session->auth_ntlmssp_state,
-                               &session->server_info);
-       } else {
-               /* Note that this server_info won't have a session
-                * key.  But for map to guest, that's exactly the right
-                * thing - we can't reasonably guess the key the
-                * client wants, as the password was wrong */
-               status = do_map_to_guest(status,
-                       &session->server_info,
-                       auth_ntlmssp_get_username(session->auth_ntlmssp_state),
-                       auth_ntlmssp_get_domain(session->auth_ntlmssp_state));
-       }
-       return status;
-}
-
 #ifdef HAVE_KRB5
 static NTSTATUS smbd_smb2_session_setup_krb5(struct smbd_smb2_session *session,
                                        struct smbd_smb2_request *smb2req,
@@ -180,25 +168,24 @@ static NTSTATUS smbd_smb2_session_setup_krb5(struct smbd_smb2_session *session,
        DATA_BLOB secblob_out = data_blob_null;
        uint8 tok_id[2];
        struct PAC_LOGON_INFO *logon_info = NULL;
-       char *client = NULL;
-       char *p = NULL;
+       char *principal = NULL;
+       char *user = NULL;
        char *domain = NULL;
        struct passwd *pw = NULL;
        NTSTATUS status;
-       fstring user;
-       fstring real_username;
+       char *real_username;
        fstring tmp;
        bool username_was_mapped = false;
        bool map_domainuser_to_guest = false;
 
-       if (!spnego_parse_krb5_wrap(*secblob, &ticket, tok_id)) {
+       if (!spnego_parse_krb5_wrap(talloc_tos(), *secblob, &ticket, tok_id)) {
                status = NT_STATUS_LOGON_FAILURE;
                goto fail;
        }
 
        status = ads_verify_ticket(smb2req, lp_realm(), 0, &ticket,
-                               &client, &logon_info, &ap_rep,
-                               &session_key, true);
+                                  &principal, &logon_info, &ap_rep,
+                                  &session_key, true);
 
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(1,("smb2: Failed to verify incoming ticket with error %s!\n",
@@ -209,207 +196,37 @@ static NTSTATUS smbd_smb2_session_setup_krb5(struct smbd_smb2_session *session,
                goto fail;
        }
 
-       DEBUG(3,("smb2: Ticket name is [%s]\n", client));
-
-       p = strchr_m(client, '@');
-       if (!p) {
-               DEBUG(3,("smb2: %s Doesn't look like a valid principal\n",
-                       client));
-               status = NT_STATUS_LOGON_FAILURE;
+       status = get_user_from_kerberos_info(talloc_tos(),
+                                            session->sconn->remote_hostname,
+                                            principal, logon_info,
+                                            &username_was_mapped,
+                                            &map_domainuser_to_guest,
+                                            &user, &domain,
+                                            &real_username, &pw);
+       if (!NT_STATUS_IS_OK(status)) {
                goto fail;
        }
 
-       *p = 0;
-
        /* save the PAC data if we have it */
-
        if (logon_info) {
-               netsamlogon_cache_store(client, &logon_info->info3);
-       }
-
-       if (!strequal(p+1, lp_realm())) {
-               DEBUG(3,("smb2: Ticket for foreign realm %s@%s\n", client, p+1));
-               if (!lp_allow_trusted_domains()) {
-                       status = NT_STATUS_LOGON_FAILURE;
-                       goto fail;
-               }
-       }
-
-       /* this gives a fully qualified user name (ie. with full realm).
-          that leads to very long usernames, but what else can we do? */
-
-       domain = p+1;
-
-       if (logon_info && logon_info->info3.base.domain.string) {
-               domain = talloc_strdup(talloc_tos(),
-                                       logon_info->info3.base.domain.string);
-               if (!domain) {
-                       status = NT_STATUS_NO_MEMORY;
-                       goto fail;
-               }
-               DEBUG(10, ("smb2: Mapped to [%s] (using PAC)\n", domain));
-       } else {
-
-               /* If we have winbind running, we can (and must) shorten the
-                  username by using the short netbios name. Otherwise we will
-                  have inconsistent user names. With Kerberos, we get the
-                  fully qualified realm, with ntlmssp we get the short
-                  name. And even w2k3 does use ntlmssp if you for example
-                  connect to an ip address. */
-
-               wbcErr wbc_status;
-               struct wbcDomainInfo *info = NULL;
-
-               DEBUG(10, ("smb2: Mapping [%s] to short name\n", domain));
-
-               wbc_status = wbcDomainInfo(domain, &info);
-
-               if (WBC_ERROR_IS_OK(wbc_status)) {
-                       domain = talloc_strdup(talloc_tos(), info->short_name);
-
-                       wbcFreeMemory(info);
-                       if (!domain) {
-                               status = NT_STATUS_NO_MEMORY;
-                               goto fail;
-                       }
-                       DEBUG(10, ("smb2: Mapped to [%s] (using Winbind)\n", domain));
-               } else {
-                       DEBUG(3, ("smb2: Could not find short name: %s\n",
-                               wbcErrorString(wbc_status)));
-               }
-       }
-
-       /* We have to use fstring for this - map_username requires it. */
-       fstr_sprintf(user, "%s%c%s", domain, *lp_winbind_separator(), client);
-
-       /* lookup the passwd struct, create a new user if necessary */
-
-       username_was_mapped = map_username(user);
-
-       pw = smb_getpwnam(talloc_tos(), user, real_username, true );
-       if (pw) {
-               /* if a real user check pam account restrictions */
-               /* only really perfomed if "obey pam restriction" is true */
-               /* do this before an eventual mapping to guest occurs */
-               status = smb_pam_accountcheck(pw->pw_name);
-               if (!NT_STATUS_IS_OK(status)) {
-                       DEBUG(1,("smb2: PAM account restriction "
-                               "prevents user login\n"));
-                       goto fail;
-               }
-       }
-
-       if (!pw) {
-
-               /* this was originally the behavior of Samba 2.2, if a user
-                  did not have a local uid but has been authenticated, then
-                  map them to a guest account */
-
-               if (lp_map_to_guest() == MAP_TO_GUEST_ON_BAD_UID){
-                       map_domainuser_to_guest = true;
-                       fstrcpy(user,lp_guestaccount());
-                       pw = smb_getpwnam(talloc_tos(), user, real_username, true );
-               }
-
-               /* extra sanity check that the guest account is valid */
-
-               if (!pw) {
-                       DEBUG(1,("smb2: Username %s is invalid on this system\n",
-                               user));
-                       status = NT_STATUS_LOGON_FAILURE;
-                       goto fail;
-               }
+               netsamlogon_cache_store(user, &logon_info->info3);
        }
 
        /* setup the string used by %U */
-
        sub_set_smb_name(real_username);
-       reload_services(true);
-
-       if (map_domainuser_to_guest) {
-               make_server_info_guest(session, &session->server_info);
-       } else if (logon_info) {
-               /* pass the unmapped username here since map_username()
-                  will be called again from inside make_server_info_info3() */
-
-               status = make_server_info_info3(session,
-                                               client,
-                                               domain,
-                                               &session->server_info,
-                                               &logon_info->info3);
-               if (!NT_STATUS_IS_OK(status) ) {
-                       DEBUG(1,("smb2: make_server_info_info3 failed: %s!\n",
-                               nt_errstr(status)));
-                       goto fail;
-               }
-
-       } else {
-               /*
-                * We didn't get a PAC, we have to make up the user
-                * ourselves. Try to ask the pdb backend to provide
-                * SID consistency with ntlmssp session setup
-                */
-               struct samu *sampass;
-               /* The stupid make_server_info_XX functions here
-                  don't take a talloc context. */
-               struct auth_serversupplied_info *tmp_server_info = NULL;
-
-               sampass = samu_new(talloc_tos());
-               if (sampass == NULL) {
-                       status = NT_STATUS_NO_MEMORY;
-                       goto fail;
-               }
 
-               if (pdb_getsampwnam(sampass, real_username)) {
-                       DEBUG(10, ("smb2: found user %s in passdb, calling "
-                               "make_server_info_sam\n", real_username));
-                       status = make_server_info_sam(&tmp_server_info, sampass);
-                       TALLOC_FREE(sampass);
-               } else {
-                       /*
-                        * User not in passdb, make it up artificially
-                        */
-                       TALLOC_FREE(sampass);
-                       DEBUG(10, ("smb2: didn't find user %s in passdb, calling "
-                               "make_server_info_pw\n", real_username));
-                       status = make_server_info_pw(&tmp_server_info,
-                                       real_username,
-                                       pw);
-               }
-
-               if (!NT_STATUS_IS_OK(status)) {
-                       DEBUG(1,("smb2: make_server_info_[sam|pw] failed: %s!\n",
-                               nt_errstr(status)));
-                       goto fail;
-                }
-
-               /* Steal tmp_server_info into the session->server_info
-                  pointer. */
-               session->server_info = talloc_move(session, &tmp_server_info);
-
-               /* make_server_info_pw does not set the domain. Without this
-                * we end up with the local netbios name in substitutions for
-                * %D. */
-
-               if (session->server_info->info3 != NULL) {
-                       session->server_info->info3->base.domain.string =
-                               talloc_strdup(session->server_info->info3, domain);
-               }
-
-       }
-
-       session->server_info->nss_token |= username_was_mapped;
+       /* reload services so that the new %U is taken into account */
+       reload_services(smb2req->sconn->msg_ctx, smb2req->sconn->sock, true);
 
-       /* we need to build the token for the user. make_server_info_guest()
-          already does this */
-
-       if (!session->server_info->ptok ) {
-               status = create_local_token(session->server_info);
-               if (!NT_STATUS_IS_OK(status)) {
-                       DEBUG(10,("smb2: failed to create local token: %s\n",
-                               nt_errstr(status)));
-                       goto fail;
-               }
+       status = make_session_info_krb5(session,
+                                       user, domain, real_username, pw,
+                                       logon_info, map_domainuser_to_guest,
+                                       username_was_mapped,
+                                       &session_key,
+                                       &session->session_info);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(1, ("smb2: make_server_info_krb5 failed\n"));
+               goto fail;
        }
 
        if ((in_security_mode & SMB2_NEGOTIATE_SIGNING_REQUIRED) ||
@@ -417,7 +234,7 @@ static NTSTATUS smbd_smb2_session_setup_krb5(struct smbd_smb2_session *session,
                session->do_signing = true;
        }
 
-       if (session->server_info->guest) {
+       if (security_session_user_level(session->session_info, NULL) < SECURITY_USER) {
                /* we map anonymous to guest internally */
                *out_session_flags |= SMB2_SESSION_FLAG_IS_GUEST;
                *out_session_flags |= SMB2_SESSION_FLAG_IS_NULL;
@@ -425,19 +242,7 @@ static NTSTATUS smbd_smb2_session_setup_krb5(struct smbd_smb2_session *session,
                session->do_signing = false;
        }
 
-       data_blob_free(&session->server_info->user_session_key);
-       session->server_info->user_session_key =
-                       data_blob_talloc(
-                               session->server_info,
-                               session_key.data,
-                               session_key.length);
-        if (session_key.length > 0) {
-               if (session->server_info->user_session_key.data == NULL) {
-                       status = NT_STATUS_NO_MEMORY;
-                       goto fail;
-               }
-       }
-       session->session_key = session->server_info->user_session_key;
+       session->session_key = session->session_info->session_key;
 
        session->compat_vuser = talloc_zero(session, user_struct);
        if (session->compat_vuser == NULL) {
@@ -446,26 +251,22 @@ static NTSTATUS smbd_smb2_session_setup_krb5(struct smbd_smb2_session *session,
        }
        session->compat_vuser->auth_ntlmssp_state = NULL;
        session->compat_vuser->homes_snum = -1;
-       session->compat_vuser->server_info = session->server_info;
+       session->compat_vuser->session_info = session->session_info;
        session->compat_vuser->session_keystr = NULL;
        session->compat_vuser->vuid = session->vuid;
        DLIST_ADD(session->sconn->smb1.sessions.validated_users, session->compat_vuser);
 
        /* This is a potentially untrusted username */
-       alpha_strcpy(tmp,
-               client,
-               ". _-$",
-               sizeof(tmp));
-       session->server_info->sanitized_username = talloc_strdup(
-                       session->server_info, tmp);
+       alpha_strcpy(tmp, user, ". _-$", sizeof(tmp));
+       session->session_info->unix_info->sanitized_username =
+                               talloc_strdup(session->session_info, tmp);
 
-       if (!session->server_info->guest) {
+       if (security_session_user_level(session->session_info, NULL) >= SECURITY_USER) {
                session->compat_vuser->homes_snum =
-                       register_homes_share(session->server_info->unix_name);
+                       register_homes_share(session->session_info->unix_info->unix_name);
        }
 
-       if (!session_claim(sconn_server_id(session->sconn),
-                          session->compat_vuser)) {
+       if (!session_claim(session->sconn, session->compat_vuser)) {
                DEBUG(1, ("smb2: Failed to claim session "
                        "for vuid=%d\n",
                        session->compat_vuser->vuid));
@@ -487,10 +288,11 @@ static NTSTATUS smbd_smb2_session_setup_krb5(struct smbd_smb2_session *session,
         status = NT_STATUS_OK;
 
        /* wrap that up in a nice GSS-API wrapping */
-       ap_rep_wrapped = spnego_gen_krb5_wrap(ap_rep,
+       ap_rep_wrapped = spnego_gen_krb5_wrap(talloc_tos(), ap_rep,
                                TOK_ID_KRB_AP_REP);
 
        secblob_out = spnego_gen_auth_response(
+                                       talloc_tos(),
                                        &ap_rep_wrapped,
                                        status,
                                        mechOID);
@@ -523,6 +325,7 @@ static NTSTATUS smbd_smb2_session_setup_krb5(struct smbd_smb2_session *session,
 
        ap_rep_wrapped = data_blob_null;
        secblob_out = spnego_gen_auth_response(
+                                       talloc_tos(),
                                        &ap_rep_wrapped,
                                        status,
                                        mechOID);
@@ -545,14 +348,13 @@ static NTSTATUS smbd_smb2_spnego_negotiate(struct smbd_smb2_session *session,
 {
        DATA_BLOB secblob_in = data_blob_null;
        DATA_BLOB chal_out = data_blob_null;
-       DATA_BLOB secblob_out = data_blob_null;
        char *kerb_mech = NULL;
        NTSTATUS status;
 
        /* Ensure we have no old NTLM state around. */
-       auth_ntlmssp_end(&session->auth_ntlmssp_state);
+       TALLOC_FREE(session->auth_ntlmssp_state);
 
-       status = parse_spnego_mechanisms(in_security_buffer,
+       status = parse_spnego_mechanisms(talloc_tos(), in_security_buffer,
                        &secblob_in, &kerb_mech);
        if (!NT_STATUS_IS_OK(status)) {
                goto out;
@@ -584,7 +386,8 @@ static NTSTATUS smbd_smb2_spnego_negotiate(struct smbd_smb2_session *session,
                status = NT_STATUS_MORE_PROCESSING_REQUIRED;
        } else {
                /* Fall back to NTLMSSP. */
-               status = auth_ntlmssp_start(&session->auth_ntlmssp_state);
+               status = auth_ntlmssp_start(session->sconn->remote_address,
+                                           &session->auth_ntlmssp_state);
                if (!NT_STATUS_IS_OK(status)) {
                        goto out;
                }
@@ -600,13 +403,11 @@ static NTSTATUS smbd_smb2_spnego_negotiate(struct smbd_smb2_session *session,
                goto out;
        }
 
-       secblob_out = spnego_gen_auth_response(&chal_out,
+       *out_security_buffer = spnego_gen_auth_response(smb2req,
+                                               &chal_out,
                                                status,
                                                OID_NTLMSSP);
-       *out_security_buffer = data_blob_talloc(smb2req,
-                                               secblob_out.data,
-                                               secblob_out.length);
-       if (secblob_out.data && out_security_buffer->data == NULL) {
+       if (out_security_buffer->data == NULL) {
                status = NT_STATUS_NO_MEMORY;
                goto out;
        }
@@ -615,13 +416,12 @@ static NTSTATUS smbd_smb2_spnego_negotiate(struct smbd_smb2_session *session,
   out:
 
        data_blob_free(&secblob_in);
-       data_blob_free(&secblob_out);
        data_blob_free(&chal_out);
-       SAFE_FREE(kerb_mech);
+       TALLOC_FREE(kerb_mech);
        if (!NT_STATUS_IS_OK(status) &&
                        !NT_STATUS_EQUAL(status,
                                NT_STATUS_MORE_PROCESSING_REQUIRED)) {
-               auth_ntlmssp_end(&session->auth_ntlmssp_state);
+               TALLOC_FREE(session->auth_ntlmssp_state);
                TALLOC_FREE(session);
        }
        return status;
@@ -641,7 +441,7 @@ static NTSTATUS smbd_smb2_common_ntlmssp_auth_return(struct smbd_smb2_session *s
                session->do_signing = true;
        }
 
-       if (session->server_info->guest) {
+       if (security_session_user_level(session->session_info, NULL) < SECURITY_USER) {
                /* we map anonymous to guest internally */
                *out_session_flags |= SMB2_SESSION_FLAG_IS_GUEST;
                *out_session_flags |= SMB2_SESSION_FLAG_IS_NULL;
@@ -649,17 +449,17 @@ static NTSTATUS smbd_smb2_common_ntlmssp_auth_return(struct smbd_smb2_session *s
                session->do_signing = false;
        }
 
-       session->session_key = session->server_info->user_session_key;
+       session->session_key = session->session_info->session_key;
 
        session->compat_vuser = talloc_zero(session, user_struct);
        if (session->compat_vuser == NULL) {
-               auth_ntlmssp_end(&session->auth_ntlmssp_state);
+               TALLOC_FREE(session->auth_ntlmssp_state);
                TALLOC_FREE(session);
                return NT_STATUS_NO_MEMORY;
        }
        session->compat_vuser->auth_ntlmssp_state = session->auth_ntlmssp_state;
        session->compat_vuser->homes_snum = -1;
-       session->compat_vuser->server_info = session->server_info;
+       session->compat_vuser->session_info = session->session_info;
        session->compat_vuser->session_keystr = NULL;
        session->compat_vuser->vuid = session->vuid;
        DLIST_ADD(session->sconn->smb1.sessions.validated_users, session->compat_vuser);
@@ -669,20 +469,19 @@ static NTSTATUS smbd_smb2_common_ntlmssp_auth_return(struct smbd_smb2_session *s
                     auth_ntlmssp_get_username(session->auth_ntlmssp_state),
                     ". _-$",
                     sizeof(tmp));
-       session->server_info->sanitized_username = talloc_strdup(
-               session->server_info, tmp);
+       session->session_info->unix_info->sanitized_username = talloc_strdup(
+               session->session_info, tmp);
 
-       if (!session->compat_vuser->server_info->guest) {
+       if (security_session_user_level(session->session_info, NULL) >= SECURITY_USER) {
                session->compat_vuser->homes_snum =
-                       register_homes_share(session->server_info->unix_name);
+                       register_homes_share(session->session_info->unix_info->unix_name);
        }
 
-       if (!session_claim(sconn_server_id(session->sconn),
-                          session->compat_vuser)) {
+       if (!session_claim(session->sconn, session->compat_vuser)) {
                DEBUG(1, ("smb2: Failed to claim session "
                        "for vuid=%d\n",
                        session->compat_vuser->vuid));
-               auth_ntlmssp_end(&session->auth_ntlmssp_state);
+               TALLOC_FREE(session->auth_ntlmssp_state);
                TALLOC_FREE(session);
                return NT_STATUS_LOGON_FAILURE;
        }
@@ -716,10 +515,9 @@ static NTSTATUS smbd_smb2_spnego_auth(struct smbd_smb2_session *session,
 {
        DATA_BLOB auth = data_blob_null;
        DATA_BLOB auth_out = data_blob_null;
-       DATA_BLOB secblob_out = data_blob_null;
        NTSTATUS status;
 
-       if (!spnego_parse_auth(in_security_buffer, &auth)) {
+       if (!spnego_parse_auth(talloc_tos(), in_security_buffer, &auth)) {
                TALLOC_FREE(session);
                return NT_STATUS_LOGON_FAILURE;
        }
@@ -729,7 +527,8 @@ static NTSTATUS smbd_smb2_spnego_auth(struct smbd_smb2_session *session,
                DATA_BLOB secblob_in = data_blob_null;
                char *kerb_mech = NULL;
 
-               status = parse_spnego_mechanisms(in_security_buffer,
+               status = parse_spnego_mechanisms(talloc_tos(),
+                               in_security_buffer,
                                &secblob_in, &kerb_mech);
                if (!NT_STATUS_IS_OK(status)) {
                        TALLOC_FREE(session);
@@ -749,7 +548,7 @@ static NTSTATUS smbd_smb2_spnego_auth(struct smbd_smb2_session *session,
                                        out_session_id);
 
                        data_blob_free(&secblob_in);
-                       SAFE_FREE(kerb_mech);
+                       TALLOC_FREE(kerb_mech);
                        if (!NT_STATUS_IS_OK(status)) {
                                TALLOC_FREE(session);
                        }
@@ -767,7 +566,7 @@ static NTSTATUS smbd_smb2_spnego_auth(struct smbd_smb2_session *session,
                                "not enabled\n"));
                        TALLOC_FREE(session);
                        data_blob_free(&secblob_in);
-                       SAFE_FREE(kerb_mech);
+                       TALLOC_FREE(kerb_mech);
                        return NT_STATUS_LOGON_FAILURE;
                }
 
@@ -775,7 +574,8 @@ static NTSTATUS smbd_smb2_spnego_auth(struct smbd_smb2_session *session,
        }
 
        if (session->auth_ntlmssp_state == NULL) {
-               status = auth_ntlmssp_start(&session->auth_ntlmssp_state);
+               status = auth_ntlmssp_start(session->sconn->remote_address,
+                                           &session->auth_ntlmssp_state);
                if (!NT_STATUS_IS_OK(status)) {
                        data_blob_free(&auth);
                        TALLOC_FREE(session);
@@ -786,14 +586,17 @@ static NTSTATUS smbd_smb2_spnego_auth(struct smbd_smb2_session *session,
        status = auth_ntlmssp_update(session->auth_ntlmssp_state,
                                     auth,
                                     &auth_out);
-       if (!NT_STATUS_IS_OK(status) &&
-                       !NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
-               status = setup_ntlmssp_server_info(session, status);
+       /* If status is NT_STATUS_OK then we need to get the token.
+        * Map to guest is now internal to auth_ntlmssp */
+       if (NT_STATUS_IS_OK(status)) {
+               status = auth_ntlmssp_steal_session_info(session,
+                               session->auth_ntlmssp_state,
+                               &session->session_info);
        }
 
        if (!NT_STATUS_IS_OK(status) &&
                        !NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
-               auth_ntlmssp_end(&session->auth_ntlmssp_state);
+               TALLOC_FREE(session->auth_ntlmssp_state);
                data_blob_free(&auth);
                TALLOC_FREE(session);
                return status;
@@ -801,14 +604,11 @@ static NTSTATUS smbd_smb2_spnego_auth(struct smbd_smb2_session *session,
 
        data_blob_free(&auth);
 
-       secblob_out = spnego_gen_auth_response(&auth_out,
-                               status, NULL);
+       *out_security_buffer = spnego_gen_auth_response(smb2req,
+                               &auth_out, status, NULL);
 
-       *out_security_buffer = data_blob_talloc(smb2req,
-                                               secblob_out.data,
-                                               secblob_out.length);
-       if (secblob_out.data && out_security_buffer->data == NULL) {
-               auth_ntlmssp_end(&session->auth_ntlmssp_state);
+       if (out_security_buffer->data == NULL) {
+               TALLOC_FREE(session->auth_ntlmssp_state);
                TALLOC_FREE(session);
                return NT_STATUS_NO_MEMORY;
        }
@@ -840,7 +640,8 @@ static NTSTATUS smbd_smb2_raw_ntlmssp_auth(struct smbd_smb2_session *session,
        DATA_BLOB secblob_out = data_blob_null;
 
        if (session->auth_ntlmssp_state == NULL) {
-               status = auth_ntlmssp_start(&session->auth_ntlmssp_state);
+               status = auth_ntlmssp_start(session->sconn->remote_address,
+                                           &session->auth_ntlmssp_state);
                if (!NT_STATUS_IS_OK(status)) {
                        TALLOC_FREE(session);
                        return status;
@@ -858,7 +659,7 @@ static NTSTATUS smbd_smb2_raw_ntlmssp_auth(struct smbd_smb2_session *session,
                                                secblob_out.data,
                                                secblob_out.length);
                if (secblob_out.data && out_security_buffer->data == NULL) {
-                       auth_ntlmssp_end(&session->auth_ntlmssp_state);
+                       TALLOC_FREE(session->auth_ntlmssp_state);
                        TALLOC_FREE(session);
                        return NT_STATUS_NO_MEMORY;
                }
@@ -869,10 +670,12 @@ static NTSTATUS smbd_smb2_raw_ntlmssp_auth(struct smbd_smb2_session *session,
                return status;
        }
 
-       status = setup_ntlmssp_server_info(session, status);
+       status = auth_ntlmssp_steal_session_info(session,
+                                                session->auth_ntlmssp_state,
+                                                &session->session_info);
 
        if (!NT_STATUS_IS_OK(status)) {
-               auth_ntlmssp_end(&session->auth_ntlmssp_state);
+               TALLOC_FREE(session->auth_ntlmssp_state);
                TALLOC_FREE(session);
                return status;
        }
@@ -971,69 +774,11 @@ static NTSTATUS smbd_smb2_session_setup(struct smbd_smb2_request *smb2req,
        /* Unknown packet type. */
        DEBUG(1,("Unknown packet type %u in smb2 sessionsetup\n",
                (unsigned int)in_security_buffer.data[0] ));
-       auth_ntlmssp_end(&session->auth_ntlmssp_state);
+       TALLOC_FREE(session->auth_ntlmssp_state);
        TALLOC_FREE(session);
        return NT_STATUS_LOGON_FAILURE;
 }
 
-NTSTATUS smbd_smb2_request_check_session(struct smbd_smb2_request *req)
-{
-       const uint8_t *inhdr;
-       const uint8_t *outhdr;
-       int i = req->current_idx;
-       uint64_t in_session_id;
-       void *p;
-       struct smbd_smb2_session *session;
-       bool chained_fixup = false;
-
-       inhdr = (const uint8_t *)req->in.vector[i+0].iov_base;
-
-       in_session_id = BVAL(inhdr, SMB2_HDR_SESSION_ID);
-
-       if (in_session_id == (0xFFFFFFFFFFFFFFFFLL)) {
-               if (req->async) {
-                       /*
-                        * async request - fill in session_id from
-                        * already setup request out.vector[].iov_base.
-                        */
-                       outhdr = (const uint8_t *)req->out.vector[i].iov_base;
-                       in_session_id = BVAL(outhdr, SMB2_HDR_SESSION_ID);
-               } else if (i > 2) {
-                       /*
-                        * Chained request - fill in session_id from
-                        * the previous request out.vector[].iov_base.
-                        */
-                       outhdr = (const uint8_t *)req->out.vector[i-3].iov_base;
-                       in_session_id = BVAL(outhdr, SMB2_HDR_SESSION_ID);
-                       chained_fixup = true;
-               }
-       }
-
-       /* lookup an existing session */
-       p = idr_find(req->sconn->smb2.sessions.idtree, in_session_id);
-       if (p == NULL) {
-               return NT_STATUS_USER_SESSION_DELETED;
-       }
-       session = talloc_get_type_abort(p, struct smbd_smb2_session);
-
-       if (!NT_STATUS_IS_OK(session->status)) {
-               return NT_STATUS_ACCESS_DENIED;
-       }
-
-       set_current_user_info(session->server_info->sanitized_username,
-                             session->server_info->unix_name,
-                             session->server_info->info3->base.domain.string);
-
-       req->session = session;
-
-       if (chained_fixup) {
-               /* Fix up our own outhdr. */
-               outhdr = (const uint8_t *)req->out.vector[i].iov_base;
-               SBVAL(outhdr, SMB2_HDR_SESSION_ID, in_session_id);
-       }
-       return NT_STATUS_OK;
-}
-
 NTSTATUS smbd_smb2_request_process_logoff(struct smbd_smb2_request *req)
 {
        const uint8_t *inbody;