s3-registry: Check return code of push_reg_sz().
[kai/samba.git] / source3 / auth / auth_util.c
index e2a3dadd4618947ee18cdb5e6fb188fa1d7d040f..b75a390f361a63ea8aa9484d6c6b4c03f41d9ea1 100644 (file)
@@ -2,10 +2,10 @@
    Unix SMB/CIFS implementation.
    Authentication utility functions
    Copyright (C) Andrew Tridgell 1992-1998
-   Copyright (C) Andrew Bartlett 2001
+   Copyright (C) Andrew Bartlett 2001-2011
    Copyright (C) Jeremy Allison 2000-2001
    Copyright (C) Rafal Szczesniak 2002
-   Copyright (C) Volker Lendecke 2006
+   Copyright (C) Volker Lendecke 2006-2008
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 #include "../lib/util/util_pw.h"
 #include "lib/winbind_util.h"
 #include "passdb.h"
+#include "../librpc/gen_ndr/ndr_auth.h"
+#include "../auth/auth_sam_reply.h"
+#include "../librpc/gen_ndr/idmap.h"
+#include "lib/param/loadparm.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH
@@ -44,7 +48,7 @@ static int _smb_create_user(const char *domain, const char *unix_username, const
        char *add_script;
        int ret;
 
-       add_script = talloc_strdup(ctx, lp_adduser_script());
+       add_script = lp_adduser_script(ctx);
        if (!add_script || !*add_script) {
                return -1;
        }
@@ -89,8 +93,9 @@ NTSTATUS make_user_info_map(struct auth_usersupplied_info **user_info,
                            const char *smb_name,
                            const char *client_domain,
                            const char *workstation_name,
-                           DATA_BLOB *lm_pwd,
-                           DATA_BLOB *nt_pwd,
+                           const struct tsocket_address *remote_address,
+                           const DATA_BLOB *lm_pwd,
+                           const DATA_BLOB *nt_pwd,
                            const struct samr_Password *lm_interactive_pwd,
                            const struct samr_Password *nt_interactive_pwd,
                            const char *plaintext,
@@ -137,12 +142,12 @@ NTSTATUS make_user_info_map(struct auth_usersupplied_info **user_info,
 
        result = make_user_info(user_info, smb_name, internal_username,
                              client_domain, domain, workstation_name,
-                             lm_pwd, nt_pwd,
+                             remote_address, lm_pwd, nt_pwd,
                              lm_interactive_pwd, nt_interactive_pwd,
                              plaintext, password_state);
        if (NT_STATUS_IS_OK(result)) {
                /* We have tried mapping */
-               (*user_info)->mapped_state = True;
+               (*user_info)->mapped_state = true;
                /* did we actually map the user to a different name? */
                (*user_info)->was_mapped = was_mapped;
        }
@@ -158,6 +163,7 @@ bool make_user_info_netlogon_network(struct auth_usersupplied_info **user_info,
                                     const char *smb_name, 
                                     const char *client_domain, 
                                     const char *workstation_name,
+                                    const struct tsocket_address *remote_address,
                                     uint32 logon_parameters,
                                     const uchar *lm_network_pwd,
                                     int lm_pwd_len,
@@ -172,6 +178,7 @@ bool make_user_info_netlogon_network(struct auth_usersupplied_info **user_info,
        status = make_user_info_map(user_info,
                                    smb_name, client_domain, 
                                    workstation_name,
+                                   remote_address,
                                    lm_pwd_len ? &lm_blob : NULL, 
                                    nt_pwd_len ? &nt_blob : NULL,
                                    NULL, NULL, NULL,
@@ -180,7 +187,7 @@ bool make_user_info_netlogon_network(struct auth_usersupplied_info **user_info,
        if (NT_STATUS_IS_OK(status)) {
                (*user_info)->logon_parameters = logon_parameters;
        }
-       ret = NT_STATUS_IS_OK(status) ? True : False;
+       ret = NT_STATUS_IS_OK(status) ? true : false;
 
        data_blob_free(&lm_blob);
        data_blob_free(&nt_blob);
@@ -196,19 +203,16 @@ bool make_user_info_netlogon_interactive(struct auth_usersupplied_info **user_in
                                         const char *smb_name, 
                                         const char *client_domain, 
                                         const char *workstation_name,
+                                        const struct tsocket_address *remote_address,
                                         uint32 logon_parameters,
                                         const uchar chal[8], 
                                         const uchar lm_interactive_pwd[16], 
-                                        const uchar nt_interactive_pwd[16], 
-                                        const uchar *dc_sess_key)
+                                        const uchar nt_interactive_pwd[16])
 {
        struct samr_Password lm_pwd;
        struct samr_Password nt_pwd;
        unsigned char local_lm_response[24];
        unsigned char local_nt_response[24];
-       unsigned char key[16];
-
-       memcpy(key, dc_sess_key, 16);
 
        if (lm_interactive_pwd)
                memcpy(lm_pwd.hash, lm_interactive_pwd, sizeof(lm_pwd.hash));
@@ -216,31 +220,6 @@ bool make_user_info_netlogon_interactive(struct auth_usersupplied_info **user_in
        if (nt_interactive_pwd)
                memcpy(nt_pwd.hash, nt_interactive_pwd, sizeof(nt_pwd.hash));
 
-#ifdef DEBUG_PASSWORD
-       DEBUG(100,("key:"));
-       dump_data(100, key, sizeof(key));
-
-       DEBUG(100,("lm owf password:"));
-       dump_data(100, lm_pwd.hash, sizeof(lm_pwd.hash));
-
-       DEBUG(100,("nt owf password:"));
-       dump_data(100, nt_pwd.hash, sizeof(nt_pwd.hash));
-#endif
-
-       if (lm_interactive_pwd)
-               arcfour_crypt(lm_pwd.hash, key, sizeof(lm_pwd.hash));
-
-       if (nt_interactive_pwd)
-               arcfour_crypt(nt_pwd.hash, key, sizeof(nt_pwd.hash));
-
-#ifdef DEBUG_PASSWORD
-       DEBUG(100,("decrypt of lm owf password:"));
-       dump_data(100, lm_pwd.hash, sizeof(lm_pwd));
-
-       DEBUG(100,("decrypt of nt owf password:"));
-       dump_data(100, nt_pwd.hash, sizeof(nt_pwd));
-#endif
-
        if (lm_interactive_pwd)
                SMBOWFencrypt(lm_pwd.hash, chal,
                              local_lm_response);
@@ -249,9 +228,6 @@ bool make_user_info_netlogon_interactive(struct auth_usersupplied_info **user_in
                SMBOWFencrypt(nt_pwd.hash, chal,
                              local_nt_response);
 
-       /* Password info paranoia */
-       ZERO_STRUCT(key);
-
        {
                bool ret;
                NTSTATUS nt_status;
@@ -271,6 +247,7 @@ bool make_user_info_netlogon_interactive(struct auth_usersupplied_info **user_in
                nt_status = make_user_info_map(
                        user_info, 
                        smb_name, client_domain, workstation_name,
+                       remote_address,
                        lm_interactive_pwd ? &local_lm_blob : NULL,
                        nt_interactive_pwd ? &local_nt_blob : NULL,
                        lm_interactive_pwd ? &lm_pwd : NULL,
@@ -281,7 +258,7 @@ bool make_user_info_netlogon_interactive(struct auth_usersupplied_info **user_in
                        (*user_info)->logon_parameters = logon_parameters;
                }
 
-               ret = NT_STATUS_IS_OK(nt_status) ? True : False;
+               ret = NT_STATUS_IS_OK(nt_status) ? true : false;
                data_blob_free(&local_lm_blob);
                data_blob_free(&local_nt_blob);
                return ret;
@@ -296,6 +273,7 @@ bool make_user_info_netlogon_interactive(struct auth_usersupplied_info **user_in
 bool make_user_info_for_reply(struct auth_usersupplied_info **user_info,
                              const char *smb_name, 
                              const char *client_domain,
+                             const struct tsocket_address *remote_address,
                              const uint8 chal[8],
                              DATA_BLOB plaintext_password)
 {
@@ -336,12 +314,13 @@ bool make_user_info_for_reply(struct auth_usersupplied_info **user_info,
                                                   (const char *)plaintext_password.data,
                                                   plaintext_password.length);
        if (!plaintext_password_string) {
-               return False;
+               return false;
        }
 
-       ret = make_user_info_map(
-               user_info, smb_name, client_domain, 
+       ret = make_user_info(
+               user_info, smb_name, smb_name, client_domain, client_domain, 
                get_remote_machine_name(),
+               remote_address,
                local_lm_blob.data ? &local_lm_blob : NULL,
                local_nt_blob.data ? &local_nt_blob : NULL,
                NULL, NULL,
@@ -354,7 +333,7 @@ bool make_user_info_for_reply(struct auth_usersupplied_info **user_info,
        }
 
        data_blob_free(&local_lm_blob);
-       return NT_STATUS_IS_OK(ret) ? True : False;
+       return NT_STATUS_IS_OK(ret) ? true : false;
 }
 
 /****************************************************************************
@@ -363,23 +342,26 @@ bool make_user_info_for_reply(struct auth_usersupplied_info **user_info,
 
 NTSTATUS make_user_info_for_reply_enc(struct auth_usersupplied_info **user_info,
                                       const char *smb_name,
-                                      const char *client_domain, 
+                                      const char *client_domain,
+                                     const struct tsocket_address *remote_address,
                                       DATA_BLOB lm_resp, DATA_BLOB nt_resp)
 {
-       return make_user_info_map(user_info, smb_name, 
-                                 client_domain, 
-                                 get_remote_machine_name(), 
-                                 lm_resp.data && (lm_resp.length > 0) ? &lm_resp : NULL,
-                                 nt_resp.data && (nt_resp.length > 0) ? &nt_resp : NULL,
-                                 NULL, NULL, NULL,
-                                 AUTH_PASSWORD_RESPONSE);
+       return make_user_info(user_info, smb_name, smb_name, 
+                             client_domain, client_domain, 
+                             get_remote_machine_name(),
+                             remote_address,
+                             lm_resp.data && (lm_resp.length > 0) ? &lm_resp : NULL,
+                             nt_resp.data && (nt_resp.length > 0) ? &nt_resp : NULL,
+                             NULL, NULL, NULL,
+                             AUTH_PASSWORD_RESPONSE);
 }
 
 /****************************************************************************
- Create a guest user_info blob, for anonymous authenticaion.
+ Create a guest user_info blob, for anonymous authentication.
 ****************************************************************************/
 
-bool make_user_info_guest(struct auth_usersupplied_info **user_info)
+bool make_user_info_guest(const struct tsocket_address *remote_address,
+                         struct auth_usersupplied_info **user_info)
 {
        NTSTATUS nt_status;
 
@@ -387,12 +369,13 @@ bool make_user_info_guest(struct auth_usersupplied_info **user_info)
                                   "","", 
                                   "","", 
                                   "", 
+                                  remote_address,
                                   NULL, NULL, 
                                   NULL, NULL, 
                                   NULL,
                                   AUTH_PASSWORD_RESPONSE);
 
-       return NT_STATUS_IS_OK(nt_status) ? True : False;
+       return NT_STATUS_IS_OK(nt_status) ? true : false;
 }
 
 static NTSTATUS log_nt_token(struct security_token *token)
@@ -402,8 +385,8 @@ static NTSTATUS log_nt_token(struct security_token *token)
        char *group_sidstr;
        size_t i;
 
-       if ((lp_log_nt_token_command() == NULL) ||
-           (strlen(lp_log_nt_token_command()) == 0)) {
+       if ((lp_log_nt_token_command(frame) == NULL) ||
+           (strlen(lp_log_nt_token_command(frame)) == 0)) {
                TALLOC_FREE(frame);
                return NT_STATUS_OK;
        }
@@ -416,7 +399,7 @@ static NTSTATUS log_nt_token(struct security_token *token)
        }
 
        command = talloc_string_sub(
-               frame, lp_log_nt_token_command(),
+               frame, lp_log_nt_token_command(frame),
                "%s", sid_string_talloc(frame, &token->sids[0]));
        command = talloc_string_sub(frame, command, "%t", group_sidstr);
 
@@ -444,14 +427,16 @@ static NTSTATUS log_nt_token(struct security_token *token)
 NTSTATUS create_local_token(TALLOC_CTX *mem_ctx,
                            const struct auth_serversupplied_info *server_info,
                            DATA_BLOB *session_key,
-                           struct auth_serversupplied_info **session_info_out)
+                           const char *smb_username, /* for ->sanitized_username, for %U subs */
+                           struct auth_session_info **session_info_out)
 {
        struct security_token *t;
        NTSTATUS status;
        size_t i;
        struct dom_sid tmp_sid;
-       struct auth_serversupplied_info *session_info;
-       struct wbcUnixId *ids;
+       struct auth_session_info *session_info;
+       struct unixid *ids;
+       fstring tmp;
 
        /* Ensure we can't possible take a code path leading to a
         * null defref. */
@@ -459,12 +444,37 @@ NTSTATUS create_local_token(TALLOC_CTX *mem_ctx,
                return NT_STATUS_LOGON_FAILURE;
        }
 
-       session_info = copy_serverinfo(mem_ctx, server_info);
-
+       session_info = talloc_zero(mem_ctx, struct auth_session_info);
        if (!session_info) {
                return NT_STATUS_NO_MEMORY;
        }
 
+       session_info->unix_token = talloc_zero(session_info, struct security_unix_token);
+       if (!session_info->unix_token) {
+               TALLOC_FREE(session_info);
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       session_info->unix_token->uid = server_info->utok.uid;
+       session_info->unix_token->gid = server_info->utok.gid;
+
+       session_info->unix_info = talloc_zero(session_info, struct auth_user_info_unix);
+       if (!session_info->unix_info) {
+               TALLOC_FREE(session_info);
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       session_info->unix_info->unix_name = talloc_strdup(session_info, server_info->unix_name);
+       if (!session_info->unix_info->unix_name) {
+               TALLOC_FREE(session_info);
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       /* This is a potentially untrusted username for use in %U */
+       alpha_strcpy(tmp, smb_username, ". _-$", sizeof(tmp));
+       session_info->unix_info->sanitized_username =
+                               talloc_strdup(session_info->unix_info, tmp);
+
        if (session_key) {
                data_blob_free(&session_info->session_key);
                session_info->session_key = data_blob_talloc(session_info,
@@ -473,13 +483,41 @@ NTSTATUS create_local_token(TALLOC_CTX *mem_ctx,
                if (!session_info->session_key.data && session_key->length) {
                        return NT_STATUS_NO_MEMORY;
                }
+       } else {
+               session_info->session_key = data_blob_talloc( session_info, server_info->session_key.data,
+                                                             server_info->session_key.length);
+       }
+
+       /* We need to populate session_info->info with the information found in server_info->info3 */
+       status = make_user_info_SamBaseInfo(session_info, "", &server_info->info3->base,
+                                           server_info->guest == false,
+                                           &session_info->info);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("conversion of info3 into auth_user_info failed!\n"));
+               TALLOC_FREE(session_info);
+               return status;
        }
 
-       if (session_info->security_token) {
+       if (server_info->security_token) {
                /* Just copy the token, it has already been finalised
-                * (nasty hack to support a cached guest session_info,
-                * and a possible strategy for auth_samba4 to pass in
-                * a finalised session) */
+                * (nasty hack to support a cached guest/system session_info
+                */
+
+               session_info->security_token = dup_nt_token(session_info, server_info->security_token);
+               if (!session_info->security_token) {
+                       TALLOC_FREE(session_info);
+                       return NT_STATUS_NO_MEMORY;
+               }
+
+               session_info->unix_token->ngroups = server_info->utok.ngroups;
+               if (server_info->utok.ngroups != 0) {
+                       session_info->unix_token->groups = (gid_t *)talloc_memdup(
+                               session_info->unix_token, server_info->utok.groups,
+                               sizeof(gid_t)*session_info->unix_token->ngroups);
+               } else {
+                       session_info->unix_token->groups = NULL;
+               }
+
                *session_info_out = session_info;
                return NT_STATUS_OK;
        }
@@ -491,20 +529,23 @@ NTSTATUS create_local_token(TALLOC_CTX *mem_ctx,
         */
 
        if (((lp_server_role() == ROLE_DOMAIN_MEMBER) && !winbind_ping()) ||
-           (session_info->nss_token)) {
+           (server_info->nss_token)) {
+               char *found_username = NULL;
                status = create_token_from_username(session_info,
-                                                   session_info->unix_name,
-                                                   session_info->guest,
-                                                   &session_info->utok.uid,
-                                                   &session_info->utok.gid,
-                                                   &session_info->unix_name,
+                                                   server_info->unix_name,
+                                                   server_info->guest,
+                                                   &session_info->unix_token->uid,
+                                                   &session_info->unix_token->gid,
+                                                   &found_username,
                                                    &session_info->security_token);
-
+               if (NT_STATUS_IS_OK(status)) {
+                       session_info->unix_info->unix_name = found_username;
+               }
        } else {
                status = create_local_nt_token_from_info3(session_info,
-                                                         session_info->guest,
-                                                         session_info->info3,
-                                                         &session_info->extra,
+                                                         server_info->guest,
+                                                         server_info->info3,
+                                                         &server_info->extra,
                                                          &session_info->security_token);
        }
 
@@ -514,35 +555,38 @@ NTSTATUS create_local_token(TALLOC_CTX *mem_ctx,
 
        /* Convert the SIDs to gids. */
 
-       session_info->utok.ngroups = 0;
-       session_info->utok.groups = NULL;
+       session_info->unix_token->ngroups = 0;
+       session_info->unix_token->groups = NULL;
 
        t = session_info->security_token;
 
-       ids = talloc_array(talloc_tos(), struct wbcUnixId,
+       ids = talloc_array(talloc_tos(), struct unixid,
                           t->num_sids);
        if (ids == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       if (!sids_to_unix_ids(t->sids, t->num_sids, ids)) {
+       if (!sids_to_unixids(t->sids, t->num_sids, ids)) {
                TALLOC_FREE(ids);
                return NT_STATUS_NO_MEMORY;
        }
 
-       /* Start at index 1, where the groups start. */
+       for (i=0; i<t->num_sids; i++) {
 
-       for (i=1; i<t->num_sids; i++) {
+               if (i == 0 && ids[i].type != ID_TYPE_BOTH) {
+                       continue;
+               }
 
-               if (ids[i].type != WBC_ID_TYPE_GID) {
+               if (ids[i].type != ID_TYPE_GID &&
+                   ids[i].type != ID_TYPE_BOTH) {
                        DEBUG(10, ("Could not convert SID %s to gid, "
                                   "ignoring it\n",
                                   sid_string_dbg(&t->sids[i])));
                        continue;
                }
-               if (!add_gid_to_array_unique(session_info, ids[i].id.gid,
-                                            &session_info->utok.groups,
-                                            &session_info->utok.ngroups)) {
+               if (!add_gid_to_array_unique(session_info, ids[i].id,
+                                            &session_info->unix_token->groups,
+                                            &session_info->unix_token->ngroups)) {
                        return NT_STATUS_NO_MEMORY;
                }
        }
@@ -560,14 +604,14 @@ NTSTATUS create_local_token(TALLOC_CTX *mem_ctx,
         * the nt token.
         */
 
-       uid_to_unix_users_sid(session_info->utok.uid, &tmp_sid);
+       uid_to_unix_users_sid(session_info->unix_token->uid, &tmp_sid);
 
        add_sid_to_array_unique(session_info->security_token, &tmp_sid,
                                &session_info->security_token->sids,
                                &session_info->security_token->num_sids);
 
-       for ( i=0; i<session_info->utok.ngroups; i++ ) {
-               gid_to_unix_groups_sid(session_info->utok.groups[i], &tmp_sid);
+       for ( i=0; i<session_info->unix_token->ngroups; i++ ) {
+               gid_to_unix_groups_sid(session_info->unix_token->groups[i], &tmp_sid);
                add_sid_to_array_unique(session_info->security_token, &tmp_sid,
                                        &session_info->security_token->sids,
                                        &session_info->security_token->num_sids);
@@ -575,10 +619,10 @@ NTSTATUS create_local_token(TALLOC_CTX *mem_ctx,
 
        security_token_debug(DBGC_AUTH, 10, session_info->security_token);
        debug_unix_user_token(DBGC_AUTH, 10,
-                             session_info->utok.uid,
-                             session_info->utok.gid,
-                             session_info->utok.ngroups,
-                             session_info->utok.groups);
+                             session_info->unix_token->uid,
+                             session_info->unix_token->gid,
+                             session_info->unix_token->ngroups,
+                             session_info->unix_token->groups);
 
        status = log_nt_token(session_info->security_token);
        if (!NT_STATUS_IS_OK(status)) {
@@ -679,10 +723,8 @@ NTSTATUS make_server_info_pw(struct auth_serversupplied_info **server_info,
        }
 
        result->unix_name = talloc_strdup(result, unix_username);
-       result->sanitized_username = sanitize_username(result, unix_username);
 
-       if ((result->unix_name == NULL)
-           || (result->sanitized_username == NULL)) {
+       if (result->unix_name == NULL) {
                TALLOC_FREE(result);
                return NT_STATUS_NO_MEMORY;
        }
@@ -695,6 +737,40 @@ NTSTATUS make_server_info_pw(struct auth_serversupplied_info **server_info,
        return NT_STATUS_OK;
 }
 
+static NTSTATUS get_system_info3(TALLOC_CTX *mem_ctx,
+                                struct netr_SamInfo3 *info3)
+{
+       NTSTATUS status;
+       struct dom_sid *system_sid;
+
+       /* Set account name */
+       init_lsa_String(&info3->base.account_name, "SYSTEM");
+
+       /* Set domain name */
+       init_lsa_StringLarge(&info3->base.logon_domain, "NT AUTHORITY");
+
+
+       /* The SID set here will be overwirtten anyway, but try and make it SID_NT_SYSTEM anyway */
+       /* Domain sid is NT_AUTHORITY */
+       
+       system_sid = dom_sid_parse_talloc(mem_ctx, SID_NT_SYSTEM);
+       if (system_sid == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       
+       status = dom_sid_split_rid(mem_ctx, system_sid, &info3->base.domain_sid, 
+                                  &info3->base.rid);
+       TALLOC_FREE(system_sid);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+       
+       /* Primary gid is the same */
+       info3->base.primary_gid = info3->base.rid;
+
+       return NT_STATUS_OK;
+}
+
 static NTSTATUS get_guest_info3(TALLOC_CTX *mem_ctx,
                                struct netr_SamInfo3 *info3)
 {
@@ -710,7 +786,7 @@ static NTSTATUS get_guest_info3(TALLOC_CTX *mem_ctx,
                return NT_STATUS_NO_SUCH_USER;
        }
 
-       /* Set acount name */
+       /* Set account name */
        tmp = talloc_strdup(mem_ctx, pwd->pw_name);
        if (tmp == NULL) {
                return NT_STATUS_NO_MEMORY;
@@ -722,7 +798,7 @@ static NTSTATUS get_guest_info3(TALLOC_CTX *mem_ctx,
        if (tmp == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
-       init_lsa_StringLarge(&info3->base.domain, tmp);
+       init_lsa_StringLarge(&info3->base.logon_domain, tmp);
 
        /* Domain sid */
        sid_copy(&domain_sid, get_global_sam_sid());
@@ -736,7 +812,10 @@ static NTSTATUS get_guest_info3(TALLOC_CTX *mem_ctx,
        info3->base.rid = DOMAIN_RID_GUEST;
 
        /* Primary gid */
-       info3->base.primary_gid = BUILTIN_RID_GUESTS;
+       info3->base.primary_gid = DOMAIN_RID_GUESTS;
+
+       /* Set as guest */
+       info3->base.user_flags = NETLOGON_GUEST;
 
        TALLOC_FREE(pwd);
        return NT_STATUS_OK;
@@ -749,20 +828,18 @@ static NTSTATUS get_guest_info3(TALLOC_CTX *mem_ctx,
 
  The resulting structure is a 'session_info' because
  create_local_token() has already been called on it.  This is quite
- nasty, as the auth subsystem isn't expect this, but the behaviour is
+ nasty, as the auth subsystem isn't expect this, but the behavior is
  left as-is for now.
 ***************************************************************************/
 
-static NTSTATUS make_new_server_info_guest(struct auth_serversupplied_info **session_info)
+static NTSTATUS make_new_session_info_guest(struct auth_session_info **session_info, struct auth_serversupplied_info **server_info)
 {
-       struct auth_serversupplied_info *server_info;
        static const char zeros[16] = {0};
        const char *guest_account = lp_guestaccount();
        const char *domain = lp_netbios_name();
        struct netr_SamInfo3 info3;
        TALLOC_CTX *tmp_ctx;
        NTSTATUS status;
-       fstring tmp;
 
        tmp_ctx = talloc_stackframe();
        if (tmp_ctx == NULL) {
@@ -773,40 +850,41 @@ static NTSTATUS make_new_server_info_guest(struct auth_serversupplied_info **ses
 
        status = get_guest_info3(tmp_ctx, &info3);
        if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("get_guest_info3 failed with %s\n",
+                         nt_errstr(status)));
                goto done;
        }
 
        status = make_server_info_info3(tmp_ctx,
                                        guest_account,
                                        domain,
-                                       &server_info,
+                                       server_info,
                                        &info3);
        if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("make_server_info_info3 failed with %s\n",
+                         nt_errstr(status)));
                goto done;
        }
 
-       server_info->guest = True;
+       (*server_info)->guest = true;
 
        /* This should not be done here (we should produce a server
         * info, and later construct a session info from it), but for
-        * now this does not change the previous behaviours */
-       status = create_local_token(tmp_ctx, server_info, NULL, session_info);
-       TALLOC_FREE(server_info);
+        * now this does not change the previous behavior */
+       status = create_local_token(tmp_ctx, *server_info, NULL,
+                                   (*server_info)->info3->base.account_name.string,
+                                   session_info);
        if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(10, ("create_local_token failed: %s\n",
-                          nt_errstr(status)));
+               DEBUG(0, ("create_local_token failed: %s\n",
+                         nt_errstr(status)));
                goto done;
        }
        talloc_steal(NULL, *session_info);
+       talloc_steal(NULL, *server_info);
 
        /* annoying, but the Guest really does have a session key, and it is
           all zeros! */
        (*session_info)->session_key = data_blob(zeros, sizeof(zeros));
-       (*session_info)->lm_session_key = data_blob(zeros, sizeof(zeros));
-
-       alpha_strcpy(tmp, (*session_info)->info3->base.account_name.string,
-                    ". _-$", sizeof(tmp));
-       (*session_info)->sanitized_username = talloc_strdup(*session_info, tmp);
 
        status = NT_STATUS_OK;
 done:
@@ -820,41 +898,87 @@ done:
 ***************************************************************************/
 
 static NTSTATUS make_new_session_info_system(TALLOC_CTX *mem_ctx,
-                                           struct auth_serversupplied_info **session_info)
+                                           struct auth_session_info **session_info)
 {
-       struct passwd *pwd;
        NTSTATUS status;
+       struct auth_serversupplied_info *server_info;
+       TALLOC_CTX *tmp_ctx;
 
-       pwd = getpwuid_alloc(mem_ctx, sec_initial_uid());
-       if (pwd == NULL) {
-               return NT_STATUS_NO_SUCH_USER;
+       tmp_ctx = talloc_stackframe();
+       if (tmp_ctx == NULL) {
+               return NT_STATUS_NO_MEMORY;
        }
 
-       status = make_session_info_from_username(mem_ctx,
-                                                pwd->pw_name,
-                                                false,
-                                                session_info);
-       TALLOC_FREE(pwd);
+       server_info = make_server_info(tmp_ctx);
+       if (!server_info) {
+               status = NT_STATUS_NO_MEMORY;
+               DEBUG(0, ("failed making server_info\n"));
+               goto done;
+       }
+
+       server_info->info3 = talloc_zero(server_info, struct netr_SamInfo3);
+       if (!server_info->info3) {
+               status = NT_STATUS_NO_MEMORY;
+               DEBUG(0, ("talloc failed setting info3\n"));
+               goto done;
+       }
+
+       status = get_system_info3(server_info, server_info->info3);
        if (!NT_STATUS_IS_OK(status)) {
-               return status;
+               DEBUG(0, ("Failed creating system info3 with %s\n",
+                         nt_errstr(status)));
+               goto done;
+       }
+
+       server_info->utok.uid = sec_initial_uid();
+       server_info->utok.gid = sec_initial_gid();
+       server_info->unix_name = talloc_asprintf(server_info,
+                                                "NT AUTHORITY%cSYSTEM",
+                                                *lp_winbind_separator());
+
+       if (!server_info->unix_name) {
+               status = NT_STATUS_NO_MEMORY;
+               DEBUG(0, ("talloc_asprintf failed setting unix_name\n"));
+               goto done;
        }
 
-       (*session_info)->system = true;
+       server_info->security_token = talloc_zero(server_info, struct security_token);
+       if (!server_info->security_token) {
+               status = NT_STATUS_NO_MEMORY;
+               DEBUG(0, ("talloc failed setting security token\n"));
+               goto done;
+       }
 
-       status = add_sid_to_array_unique((*session_info)->security_token->sids,
+       status = add_sid_to_array_unique(server_info->security_token->sids,
                                         &global_sid_System,
-                                        &(*session_info)->security_token->sids,
-                                        &(*session_info)->security_token->num_sids);
+                                        &server_info->security_token->sids,
+                                        &server_info->security_token->num_sids);
        if (!NT_STATUS_IS_OK(status)) {
-               TALLOC_FREE((*session_info));
-               return status;
+               goto done;
        }
 
-       return NT_STATUS_OK;
+       /* SYSTEM has all privilages */
+       server_info->security_token->privilege_mask = ~0;
+
+       /* Now turn the server_info into a session_info with the full token etc */
+       status = create_local_token(mem_ctx, server_info, NULL, "SYSTEM", session_info);
+       talloc_free(server_info);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("create_local_token failed: %s\n",
+                         nt_errstr(status)));
+               goto done;
+       }
+
+       talloc_steal(mem_ctx, *session_info);
+
+done:
+       TALLOC_FREE(tmp_ctx);
+       return status;
 }
 
 /****************************************************************************
-  Fake a auth_serversupplied_info just from a username (as a
+  Fake a auth_session_info just from a username (as a
   session_info structure, with create_local_token() already called on
   it.
 ****************************************************************************/
@@ -862,11 +986,11 @@ static NTSTATUS make_new_session_info_system(TALLOC_CTX *mem_ctx,
 NTSTATUS make_session_info_from_username(TALLOC_CTX *mem_ctx,
                                         const char *username,
                                         bool is_guest,
-                                        struct auth_serversupplied_info **session_info)
+                                        struct auth_session_info **session_info)
 {
-       struct auth_serversupplied_info *result;
        struct passwd *pwd;
        NTSTATUS status;
+       struct auth_serversupplied_info *result;
 
        pwd = Get_Pwnam_alloc(talloc_tos(), username);
        if (pwd == NULL) {
@@ -875,8 +999,6 @@ NTSTATUS make_session_info_from_username(TALLOC_CTX *mem_ctx,
 
        status = make_server_info_pw(&result, pwd->pw_name, pwd);
 
-       TALLOC_FREE(pwd);
-
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
@@ -885,14 +1007,29 @@ NTSTATUS make_session_info_from_username(TALLOC_CTX *mem_ctx,
        result->guest = is_guest;
 
        /* Now turn the server_info into a session_info with the full token etc */
-       status = create_local_token(mem_ctx, result, NULL, session_info);
-       talloc_free(result);
+       status = create_local_token(mem_ctx, result, NULL, pwd->pw_name, session_info);
+       TALLOC_FREE(result);
+       TALLOC_FREE(pwd);
+
        return status;
 }
 
-
-struct auth_serversupplied_info *copy_serverinfo(TALLOC_CTX *mem_ctx,
-                                                const struct auth_serversupplied_info *src)
+/* This function MUST only used to create the cached server_info for
+ * guest.
+ *
+ * This is a lossy conversion.  Variables known to be lost so far
+ * include:
+ *
+ * - nss_token (not needed because the only read doesn't happen
+ * for the GUEST user, as this routine populates ->security_token
+ *
+ * - extra (not needed because the guest account must have valid RIDs per the output of get_guest_info3())
+ *
+ * - The 'server_info' parameter allows the missing 'info3' to be copied across.
+ */
+static struct auth_serversupplied_info *copy_session_info_serverinfo_guest(TALLOC_CTX *mem_ctx,
+                                                                          const struct auth_session_info *src,
+                                                                          struct auth_serversupplied_info *server_info)
 {
        struct auth_serversupplied_info *dst;
 
@@ -901,48 +1038,93 @@ struct auth_serversupplied_info *copy_serverinfo(TALLOC_CTX *mem_ctx,
                return NULL;
        }
 
-       dst->guest = src->guest;
-       dst->system = src->system;
-       dst->utok.uid = src->utok.uid;
-       dst->utok.gid = src->utok.gid;
-       dst->utok.ngroups = src->utok.ngroups;
-       if (src->utok.ngroups != 0) {
+       /* This element must be provided to convert back to an auth_serversupplied_info */
+       SMB_ASSERT(src->unix_info);
+
+       dst->guest = true;
+       dst->system = false;
+
+       /* This element must be provided to convert back to an
+        * auth_serversupplied_info.  This needs to be from the
+        * auth_session_info because the group values in particular
+        * may change during create_local_token() processing */
+       SMB_ASSERT(src->unix_token);
+       dst->utok.uid = src->unix_token->uid;
+       dst->utok.gid = src->unix_token->gid;
+       dst->utok.ngroups = src->unix_token->ngroups;
+       if (src->unix_token->ngroups != 0) {
                dst->utok.groups = (gid_t *)talloc_memdup(
-                       dst, src->utok.groups,
+                       dst, src->unix_token->groups,
                        sizeof(gid_t)*dst->utok.ngroups);
        } else {
                dst->utok.groups = NULL;
        }
 
-       if (src->security_token) {
-               dst->security_token = dup_nt_token(dst, src->security_token);
-               if (!dst->security_token) {
-                       TALLOC_FREE(dst);
-                       return NULL;
-               }
+       /* We must have a security_token as otherwise the lossy
+        * conversion without nss_token would cause create_local_token
+        * to take the wrong path */
+       SMB_ASSERT(src->security_token);
+
+       dst->security_token = dup_nt_token(dst, src->security_token);
+       if (!dst->security_token) {
+               TALLOC_FREE(dst);
+               return NULL;
        }
 
        dst->session_key = data_blob_talloc( dst, src->session_key.data,
                                                src->session_key.length);
 
-       dst->lm_session_key = data_blob_talloc(dst, src->lm_session_key.data,
-                                               src->lm_session_key.length);
+       /* This is OK because this functions is only used for the
+        * GUEST account, which has all-zero keys for both values */
+       dst->lm_session_key = data_blob_talloc(dst, src->session_key.data,
+                                               src->session_key.length);
 
-       dst->info3 = copy_netr_SamInfo3(dst, src->info3);
+       dst->info3 = copy_netr_SamInfo3(dst, server_info->info3);
        if (!dst->info3) {
                TALLOC_FREE(dst);
                return NULL;
        }
-       dst->extra = src->extra;
 
-       dst->unix_name = talloc_strdup(dst, src->unix_name);
+       dst->unix_name = talloc_strdup(dst, src->unix_info->unix_name);
        if (!dst->unix_name) {
                TALLOC_FREE(dst);
                return NULL;
        }
 
-       dst->sanitized_username = talloc_strdup(dst, src->sanitized_username);
-       if (!dst->sanitized_username) {
+       return dst;
+}
+
+struct auth_session_info *copy_session_info(TALLOC_CTX *mem_ctx,
+                                            const struct auth_session_info *src)
+{
+       struct auth_session_info *dst;
+       DATA_BLOB blob;
+       enum ndr_err_code ndr_err;
+
+       ndr_err = ndr_push_struct_blob(
+               &blob, talloc_tos(), src,
+               (ndr_push_flags_fn_t)ndr_push_auth_session_info);
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               DEBUG(0, ("copy_session_info(): ndr_push_auth_session_info failed: "
+                          "%s\n", ndr_errstr(ndr_err)));
+               return NULL;
+       }
+
+       dst = talloc(mem_ctx, struct auth_session_info);
+       if (dst == NULL) {
+               DEBUG(0, ("talloc failed\n"));
+               TALLOC_FREE(blob.data);
+               return NULL;
+       }
+
+       ndr_err = ndr_pull_struct_blob(
+               &blob, dst, dst,
+               (ndr_pull_flags_fn_t)ndr_pull_auth_session_info);
+       TALLOC_FREE(blob.data);
+
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               DEBUG(0, ("copy_session_info(): ndr_pull_auth_session_info failed: "
+                          "%s\n", ndr_errstr(ndr_err)));
                TALLOC_FREE(dst);
                return NULL;
        }
@@ -955,7 +1137,7 @@ struct auth_serversupplied_info *copy_serverinfo(TALLOC_CTX *mem_ctx,
  * SMB level session key with SystemLibraryDTC
  */
 
-bool session_info_set_session_key(struct auth_serversupplied_info *info,
+bool session_info_set_session_key(struct auth_session_info *info,
                                 DATA_BLOB session_key)
 {
        TALLOC_FREE(info->session_key.data);
@@ -966,26 +1148,39 @@ bool session_info_set_session_key(struct auth_serversupplied_info *info,
        return (info->session_key.data != NULL);
 }
 
-static struct auth_serversupplied_info *guest_info = NULL;
+static struct auth_session_info *guest_info = NULL;
+
+static struct auth_serversupplied_info *guest_server_info = NULL;
 
 bool init_guest_info(void)
 {
        if (guest_info != NULL)
-               return True;
+               return true;
 
-       return NT_STATUS_IS_OK(make_new_server_info_guest(&guest_info));
+       return NT_STATUS_IS_OK(make_new_session_info_guest(&guest_info, &guest_server_info));
 }
 
 NTSTATUS make_server_info_guest(TALLOC_CTX *mem_ctx,
                                struct auth_serversupplied_info **server_info)
 {
-       *server_info = copy_serverinfo(mem_ctx, guest_info);
+       /* This is trickier than it would appear to need to be because
+        * we are trying to avoid certain costly operations when the
+        * structure is converted to a 'auth_session_info' again in
+        * create_local_token() */
+       *server_info = copy_session_info_serverinfo_guest(mem_ctx, guest_info, guest_server_info);
        return (*server_info != NULL) ? NT_STATUS_OK : NT_STATUS_NO_MEMORY;
 }
 
-static struct auth_serversupplied_info *system_info = NULL;
+NTSTATUS make_session_info_guest(TALLOC_CTX *mem_ctx,
+                               struct auth_session_info **session_info)
+{
+       *session_info = copy_session_info(mem_ctx, guest_info);
+       return (*session_info != NULL) ? NT_STATUS_OK : NT_STATUS_NO_MEMORY;
+}
+
+static struct auth_session_info *system_info = NULL;
 
-NTSTATUS init_system_info(void)
+NTSTATUS init_system_session_info(void)
 {
        if (system_info != NULL)
                return NT_STATUS_OK;
@@ -994,45 +1189,18 @@ NTSTATUS init_system_info(void)
 }
 
 NTSTATUS make_session_info_system(TALLOC_CTX *mem_ctx,
-                               struct auth_serversupplied_info **session_info)
+                               struct auth_session_info **session_info)
 {
        if (system_info == NULL) return NT_STATUS_UNSUCCESSFUL;
-       *session_info = copy_serverinfo(mem_ctx, system_info);
+       *session_info = copy_session_info(mem_ctx, system_info);
        return (*session_info != NULL) ? NT_STATUS_OK : NT_STATUS_NO_MEMORY;
 }
 
-const struct auth_serversupplied_info *get_session_info_system(void)
+const struct auth_session_info *get_session_info_system(void)
 {
     return system_info;
 }
 
-bool copy_current_user(struct current_user *dst, struct current_user *src)
-{
-       gid_t *groups;
-       struct security_token *nt_token;
-
-       groups = (gid_t *)memdup(src->ut.groups,
-                                sizeof(gid_t) * src->ut.ngroups);
-       if ((src->ut.ngroups != 0) && (groups == NULL)) {
-               return False;
-       }
-
-       nt_token = dup_nt_token(NULL, src->nt_user_token);
-       if (nt_token == NULL) {
-               SAFE_FREE(groups);
-               return False;
-       }
-
-       dst->conn = src->conn;
-       dst->vuid = src->vuid;
-       dst->ut.uid = src->ut.uid;
-       dst->ut.gid = src->ut.gid;
-       dst->ut.ngroups = src->ut.ngroups;
-       dst->ut.groups = groups;
-       dst->nt_user_token = nt_token;
-       return True;
-}
-
 /***************************************************************************
  Purely internal function for make_server_info_info3
 ***************************************************************************/
@@ -1052,7 +1220,9 @@ static NTSTATUS check_account(TALLOC_CTX *mem_ctx, const char *domain,
        if (!lower_username) {
                return NT_STATUS_NO_MEMORY;
        }
-       strlower_m( lower_username );
+       if (!strlower_m( lower_username )) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
 
        orig_dom_user = talloc_asprintf(mem_ctx,
                                "%s%c%s",
@@ -1070,7 +1240,7 @@ static NTSTATUS check_account(TALLOC_CTX *mem_ctx, const char *domain,
                return NT_STATUS_NO_MEMORY;
        }
 
-       passwd = smb_getpwnam(mem_ctx, dom_user, &real_username, True );
+       passwd = smb_getpwnam(mem_ctx, dom_user, &real_username, true );
        if (!passwd) {
                DEBUG(3, ("Failed to find authenticated user %s via "
                          "getpwnam(), denying access.\n", dom_user));
@@ -1083,7 +1253,7 @@ static NTSTATUS check_account(TALLOC_CTX *mem_ctx, const char *domain,
 
        *pwd = passwd;
 
-       /* This is pointless -- there is no suport for differing 
+       /* This is pointless -- there is no support for differing
           unix and windows names.  Make sure to always store the 
           one we actually looked up and succeeded. Have I mentioned
           why I hate the 'winbind use default domain' parameter?   
@@ -1129,7 +1299,8 @@ struct passwd *smb_getpwnam( TALLOC_CTX *mem_ctx, const char *domuser,
                        /* make sure we get the case of the username correct */
                        /* work around 'winbind use default domain = yes' */
 
-                       if ( !strchr_m( pw->pw_name, *lp_winbind_separator() ) ) {
+                       if ( lp_winbind_use_default_domain() &&
+                            !strchr_m( pw->pw_name, *lp_winbind_separator() ) ) {
                                char *domain;
 
                                /* split the domain and username into 2 strings */
@@ -1205,11 +1376,11 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
        char *found_username = NULL;
        const char *nt_domain;
        const char *nt_username;
+       struct dom_sid user_sid;
+       struct dom_sid group_sid;
        bool username_was_mapped;
        struct passwd *pwd;
        struct auth_serversupplied_info *result;
-       struct dom_sid *group_sid;
-       struct netr_SamInfo3 *i3;
 
        /* 
           Here is where we should check the list of
@@ -1217,6 +1388,15 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
           matches.
        */
 
+       if (!sid_compose(&user_sid, info3->base.domain_sid, info3->base.rid)) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       if (!sid_compose(&group_sid, info3->base.domain_sid,
+                        info3->base.primary_gid)) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
        nt_username = talloc_strdup(mem_ctx, info3->base.account_name.string);
        if (!nt_username) {
                /* If the server didn't give us one, just use the one we sent
@@ -1224,7 +1404,7 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
                nt_username = sent_nt_username;
        }
 
-       nt_domain = talloc_strdup(mem_ctx, info3->base.domain.string);
+       nt_domain = talloc_strdup(mem_ctx, info3->base.logon_domain.string);
        if (!nt_domain) {
                /* If the server didn't give us one, just use the one we sent
                 * them */
@@ -1260,51 +1440,18 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
 
        result->unix_name = talloc_strdup(result, found_username);
 
-       result->sanitized_username = sanitize_username(result,
-                                                      result->unix_name);
-       if (result->sanitized_username == NULL) {
-               TALLOC_FREE(result);
-               return NT_STATUS_NO_MEMORY;
-       }
-
        /* copy in the info3 */
-       result->info3 = i3 = copy_netr_SamInfo3(result, info3);
+       result->info3 = copy_netr_SamInfo3(result, info3);
        if (result->info3 == NULL) {
                TALLOC_FREE(result);
                return NT_STATUS_NO_MEMORY;
        }
 
        /* Fill in the unix info we found on the way */
+
        result->utok.uid = pwd->pw_uid;
        result->utok.gid = pwd->pw_gid;
 
-       /* We can't just trust that the primary group sid sent us is something
-        * we can really use. Obtain the useable sid, and store the original
-        * one as an additional group if it had to be replaced */
-       nt_status = get_primary_group_sid(mem_ctx, found_username,
-                                         &pwd, &group_sid);
-       if (!NT_STATUS_IS_OK(nt_status)) {
-               TALLOC_FREE(result);
-               return nt_status;
-       }
-
-       /* store and check if it is the same we got originally */
-       sid_peek_rid(group_sid, &i3->base.primary_gid);
-       if (i3->base.primary_gid != info3->base.primary_gid) {
-               uint32_t n = i3->base.groups.count;
-               /* not the same, store the original as an additional group */
-               i3->base.groups.rids =
-                       talloc_realloc(i3, i3->base.groups.rids,
-                                       struct samr_RidWithAttribute, n + 1);
-               if (i3->base.groups.rids == NULL) {
-                       TALLOC_FREE(result);
-                       return NT_STATUS_NO_MEMORY;
-               }
-               i3->base.groups.rids[n].rid = info3->base.primary_gid;
-               i3->base.groups.rids[n].attributes = SE_GROUP_ENABLED;
-               i3->base.groups.count = n + 1;
-       }
-
        /* ensure we are never given NULL session keys */
 
        if (memcmp(info3->base.key.key, zeros, sizeof(zeros)) == 0) {
@@ -1325,6 +1472,8 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
 
        result->nss_token |= username_was_mapped;
 
+       result->guest = (info3->base.user_flags & NETLOGON_GUEST);
+
        *server_info = result;
 
        return NT_STATUS_OK;
@@ -1368,7 +1517,7 @@ bool is_trusted_domain(const char* dom_name)
        /* no trusted domains for a standalone server */
 
        if ( lp_server_role() == ROLE_STANDALONE )
-               return False;
+               return false;
 
        if (dom_name == NULL || dom_name[0] == '\0') {
                return false;
@@ -1387,7 +1536,7 @@ bool is_trusted_domain(const char* dom_name)
                ret = pdb_get_trusteddom_pw(dom_name, NULL, NULL, NULL);
                unbecome_root();
                if (ret)
-                       return True;
+                       return true;
        }
        else {
                wbcErr result;
@@ -1397,12 +1546,12 @@ bool is_trusted_domain(const char* dom_name)
                result = wb_is_trusted_domain(dom_name);
 
                if (result == WBC_ERR_SUCCESS) {
-                       return True;
+                       return true;
                }
 
                if (result == WBC_ERR_DOMAIN_NOT_FOUND) {
                        /* winbind could not find the domain */
-                       return False;
+                       return false;
                }
 
                /* The only other possible result is that winbind is not up
@@ -1417,9 +1566,67 @@ bool is_trusted_domain(const char* dom_name)
         * domains (like a domain member would use  */
 
        if ( trustdom_cache_fetch(dom_name, &trustdom_sid) ) {
-               return True;
+               return true;
+       }
+
+       return false;
+}
+
+
+
+/*
+  on a logon error possibly map the error to success if "map to guest"
+  is set approriately
+*/
+NTSTATUS do_map_to_guest_server_info(NTSTATUS status,
+                                    struct auth_serversupplied_info **server_info,
+                                    const char *user, const char *domain)
+{
+       user = user ? user : "";
+       domain = domain ? domain : "";
+
+       if (NT_STATUS_EQUAL(status, NT_STATUS_NO_SUCH_USER)) {
+               if ((lp_map_to_guest() == MAP_TO_GUEST_ON_BAD_USER) ||
+                   (lp_map_to_guest() == MAP_TO_GUEST_ON_BAD_PASSWORD)) {
+                       DEBUG(3,("No such user %s [%s] - using guest account\n",
+                                user, domain));
+                       return make_server_info_guest(NULL, server_info);
+               }
+       } else if (NT_STATUS_EQUAL(status, NT_STATUS_WRONG_PASSWORD)) {
+               if (lp_map_to_guest() == MAP_TO_GUEST_ON_BAD_PASSWORD) {
+                       DEBUG(3,("Registered username %s for guest access\n",
+                               user));
+                       return make_server_info_guest(NULL, server_info);
+               }
        }
 
-       return False;
+       return status;
 }
 
+/*
+  Extract session key from a session info and return it in a blob
+  if intent is KEY_USE_16BYTES, truncate it to 16 bytes
+
+  See sections 3.2.4.15 and 3.3.4.2 of MS-SMB
+  Also see https://lists.samba.org/archive/cifs-protocol/2012-January/002265.html for details
+
+  Note that returned session_key is referencing the original key, it is supposed to be
+  short-lived. If original session_info->session_key is gone, the reference will be broken.
+*/
+NTSTATUS session_extract_session_key(const struct auth_session_info *session_info, DATA_BLOB *session_key, enum session_key_use_intent intent)
+{
+
+       if (session_key == NULL || session_info == NULL) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       if (session_info->session_key.length == 0) {
+               return NT_STATUS_NO_USER_SESSION_KEY;
+       }
+
+       *session_key = session_info->session_key;
+       if (intent == KEY_USE_16BYTES) {
+               session_key->length = MIN(session_info->session_key.length, 16);
+       }
+       return NT_STATUS_OK;
+}