s3-auth Move map to guest to directly after the check_password calls
[amitay/samba.git] / source3 / auth / auth_util.c
index 23f557a3169ec6338286f26df289858fcadcf88b..1621630b876960013725736be0c15bd0171e30e2 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 "includes.h"
-#include "smbd/globals.h"
+#include "auth.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../lib/crypto/arcfour.h"
 #include "rpc_client/init_lsa.h"
+#include "../libcli/security/security.h"
+#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"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH
@@ -85,6 +91,7 @@ NTSTATUS make_user_info_map(struct auth_usersupplied_info **user_info,
                            const char *smb_name,
                            const char *client_domain,
                            const char *workstation_name,
+                           const struct tsocket_address *remote_address,
                            DATA_BLOB *lm_pwd,
                            DATA_BLOB *nt_pwd,
                            const struct samr_Password *lm_interactive_pwd,
@@ -95,9 +102,12 @@ NTSTATUS make_user_info_map(struct auth_usersupplied_info **user_info,
        const char *domain;
        NTSTATUS result;
        bool was_mapped;
-       fstring internal_username;
-       fstrcpy(internal_username, smb_name);
-       was_mapped = map_username(internal_username);
+       char *internal_username = NULL;
+
+       was_mapped = map_username(talloc_tos(), smb_name, &internal_username);
+       if (!internal_username) {
+               return NT_STATUS_NO_MEMORY;
+       }
 
        DEBUG(5, ("Mapping user [%s]\\[%s] from workstation [%s]\n",
                 client_domain, smb_name, workstation_name));
@@ -130,12 +140,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;
        }
@@ -151,6 +161,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,
@@ -165,6 +176,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,
@@ -173,7 +185,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);
@@ -189,6 +201,7 @@ 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], 
@@ -264,6 +277,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,
@@ -274,7 +288,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;
@@ -289,6 +303,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)
 {
@@ -329,12 +344,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, 
                get_remote_machine_name(),
+               remote_address,
                local_lm_blob.data ? &local_lm_blob : NULL,
                local_nt_blob.data ? &local_nt_blob : NULL,
                NULL, NULL,
@@ -347,7 +363,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;
 }
 
 /****************************************************************************
@@ -356,12 +372,14 @@ 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(), 
+                                 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,
@@ -369,10 +387,11 @@ NTSTATUS make_user_info_for_reply_enc(struct auth_usersupplied_info **user_info,
 }
 
 /****************************************************************************
- 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;
 
@@ -380,15 +399,16 @@ 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(NT_USER_TOKEN *token)
+static NTSTATUS log_nt_token(struct security_token *token)
 {
        TALLOC_CTX *frame = talloc_stackframe();
        char *command;
@@ -405,12 +425,12 @@ static NTSTATUS log_nt_token(NT_USER_TOKEN *token)
        for (i=1; i<token->num_sids; i++) {
                group_sidstr = talloc_asprintf(
                        frame, "%s %s", group_sidstr,
-                       sid_string_talloc(frame, &token->user_sids[i]));
+                       sid_string_talloc(frame, &token->sids[i]));
        }
 
        command = talloc_string_sub(
                frame, lp_log_nt_token_command(),
-               "%s", sid_string_talloc(frame, &token->user_sids[0]));
+               "%s", sid_string_talloc(frame, &token->sids[0]));
        command = talloc_string_sub(frame, command, "%t", group_sidstr);
 
        if (command == NULL) {
@@ -434,11 +454,105 @@ static NTSTATUS log_nt_token(NT_USER_TOKEN *token)
  * server_info->sids (the info3/sam groups). Find the unix gids.
  */
 
-NTSTATUS create_local_token(struct auth_serversupplied_info *server_info)
+NTSTATUS create_local_token(TALLOC_CTX *mem_ctx,
+                           const struct auth_serversupplied_info *server_info,
+                           DATA_BLOB *session_key,
+                           struct auth_session_info **session_info_out)
 {
+       struct security_token *t;
        NTSTATUS status;
        size_t i;
        struct dom_sid tmp_sid;
+       struct auth_session_info *session_info;
+       struct wbcUnixId *ids;
+
+       /* Ensure we can't possible take a code path leading to a
+        * null defref. */
+       if (!server_info) {
+               return NT_STATUS_LOGON_FAILURE;
+       }
+
+       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;
+       }
+
+       session_info->unix_info->sanitized_username = talloc_strdup(session_info, server_info->sanitized_username);
+       if (!session_info->unix_info->sanitized_username) {
+               TALLOC_FREE(session_info);
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       session_info->unix_info->system = server_info->system;
+
+       if (session_key) {
+               data_blob_free(&session_info->session_key);
+               session_info->session_key = data_blob_talloc(session_info,
+                                                                 session_key->data,
+                                                                 session_key->length);
+               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);
+       }
+
+       if (session_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) */
+
+               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;
+       }
+
+       /* 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 winbind is not around, we can not make much use of the SIDs the
@@ -448,20 +562,23 @@ NTSTATUS create_local_token(struct auth_serversupplied_info *server_info)
 
        if (((lp_server_role() == ROLE_DOMAIN_MEMBER) && !winbind_ping()) ||
            (server_info->nss_token)) {
-               status = create_token_from_username(server_info,
+               char *found_username = NULL;
+               status = create_token_from_username(session_info,
                                                    server_info->unix_name,
                                                    server_info->guest,
-                                                   &server_info->utok.uid,
-                                                   &server_info->utok.gid,
-                                                   &server_info->unix_name,
-                                                   &server_info->ptok);
-
+                                                   &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(server_info,
+               status = create_local_nt_token_from_info3(session_info,
                                                          server_info->guest,
                                                          server_info->info3,
                                                          &server_info->extra,
-                                                         &server_info->ptok);
+                                                         &session_info->security_token);
        }
 
        if (!NT_STATUS_IS_OK(status)) {
@@ -470,23 +587,37 @@ NTSTATUS create_local_token(struct auth_serversupplied_info *server_info)
 
        /* Convert the SIDs to gids. */
 
-       server_info->utok.ngroups = 0;
-       server_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,
+                          t->num_sids);
+       if (ids == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       if (!sids_to_unix_ids(t->sids, t->num_sids, ids)) {
+               TALLOC_FREE(ids);
+               return NT_STATUS_NO_MEMORY;
+       }
 
        /* Start at index 1, where the groups start. */
 
-       for (i=1; i<server_info->ptok->num_sids; i++) {
-               gid_t gid;
-               struct dom_sid *sid = &server_info->ptok->user_sids[i];
+       for (i=1; i<t->num_sids; i++) {
 
-               if (!sid_to_gid(sid, &gid)) {
+               if (ids[i].type != WBC_ID_TYPE_GID) {
                        DEBUG(10, ("Could not convert SID %s to gid, "
-                                  "ignoring it\n", sid_string_dbg(sid)));
+                                  "ignoring it\n",
+                                  sid_string_dbg(&t->sids[i])));
                        continue;
                }
-               add_gid_to_array_unique(server_info, gid,
-                                       &server_info->utok.groups,
-                                       &server_info->utok.ngroups);
+               if (!add_gid_to_array_unique(session_info, ids[i].id.gid,
+                                            &session_info->unix_token->groups,
+                                            &session_info->unix_token->ngroups)) {
+                       return NT_STATUS_NO_MEMORY;
+               }
        }
 
        /*
@@ -502,28 +633,33 @@ NTSTATUS create_local_token(struct auth_serversupplied_info *server_info)
         * the nt token.
         */
 
-       uid_to_unix_users_sid(server_info->utok.uid, &tmp_sid);
+       uid_to_unix_users_sid(session_info->unix_token->uid, &tmp_sid);
 
-       add_sid_to_array_unique(server_info->ptok, &tmp_sid,
-                               &server_info->ptok->user_sids,
-                               &server_info->ptok->num_sids);
+       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<server_info->utok.ngroups; i++ ) {
-               gid_to_unix_groups_sid(server_info->utok.groups[i], &tmp_sid);
-               add_sid_to_array_unique(server_info->ptok, &tmp_sid,
-                                       &server_info->ptok->user_sids,
-                                       &server_info->ptok->num_sids);
+       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);
        }
 
-       debug_nt_user_token(DBGC_AUTH, 10, server_info->ptok);
+       security_token_debug(DBGC_AUTH, 10, session_info->security_token);
        debug_unix_user_token(DBGC_AUTH, 10,
-                             server_info->utok.uid,
-                             server_info->utok.gid,
-                             server_info->utok.ngroups,
-                             server_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(server_info->ptok);
-       return status;
+       status = log_nt_token(session_info->security_token);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       *session_info_out = session_info;
+       return NT_STATUS_OK;
 }
 
 /***************************************************************************
@@ -605,7 +741,7 @@ NTSTATUS make_server_info_pw(struct auth_serversupplied_info **server_info,
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = samu_to_SamInfo3(result, sampass, global_myname(),
+       status = samu_to_SamInfo3(result, sampass, lp_netbios_name(),
                                  &result->info3, &result->extra);
        TALLOC_FREE(sampass);
        if (!NT_STATUS_IS_OK(status)) {
@@ -639,16 +775,15 @@ static NTSTATUS get_guest_info3(TALLOC_CTX *mem_ctx,
        struct dom_sid domain_sid;
        struct passwd *pwd;
        const char *tmp;
-       NTSTATUS status;
 
-       pwd = getpwnam_alloc(mem_ctx, guest_account);
+       pwd = Get_Pwnam_alloc(mem_ctx, guest_account);
        if (pwd == NULL) {
                DEBUG(0,("SamInfo3_for_guest: Unable to locate guest "
                         "account [%s]!\n", guest_account));
                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;
@@ -665,7 +800,7 @@ static NTSTATUS get_guest_info3(TALLOC_CTX *mem_ctx,
        /* Domain sid */
        sid_copy(&domain_sid, get_global_sam_sid());
 
-       info3->base.domain_sid = sid_dup_talloc(mem_ctx, &domain_sid);
+       info3->base.domain_sid = dom_sid_dup(mem_ctx, &domain_sid);
        if (info3->base.domain_sid == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -676,21 +811,29 @@ static NTSTATUS get_guest_info3(TALLOC_CTX *mem_ctx,
        /* Primary gid */
        info3->base.primary_gid = BUILTIN_RID_GUESTS;
 
+       /* Set as guest */
+       info3->base.user_flags = NETLOGON_GUEST;
+
        TALLOC_FREE(pwd);
-       return status;
+       return NT_STATUS_OK;
 }
 
 /***************************************************************************
  Make (and fill) a user_info struct for a guest login.
  This *must* succeed for smbd to start. If there is no mapping entry for
  the guest gid, then create one.
+
+ 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 behavior is
+ left as-is for now.
 ***************************************************************************/
 
-static NTSTATUS make_new_server_info_guest(struct auth_serversupplied_info **server_info)
+static NTSTATUS make_new_session_info_guest(struct auth_session_info **session_info, struct auth_serversupplied_info **server_info)
 {
        static const char zeros[16] = {0};
        const char *guest_account = lp_guestaccount();
-       const char *domain = global_myname();
+       const char *domain = lp_netbios_name();
        struct netr_SamInfo3 info3;
        TALLOC_CTX *tmp_ctx;
        NTSTATUS status;
@@ -705,6 +848,8 @@ static NTSTATUS make_new_server_info_guest(struct auth_serversupplied_info **ser
 
        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;
        }
 
@@ -714,76 +859,94 @@ static NTSTATUS make_new_server_info_guest(struct auth_serversupplied_info **ser
                                        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;
 
-       status = create_local_token(*server_info);
+       /* 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 behavior */
+       status = create_local_token(tmp_ctx, *server_info, NULL, 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! */
-       (*server_info)->user_session_key = data_blob(zeros, sizeof(zeros));
-       (*server_info)->lm_session_key = data_blob(zeros, sizeof(zeros));
+       (*session_info)->session_key = data_blob(zeros, sizeof(zeros));
 
        alpha_strcpy(tmp, (*server_info)->info3->base.account_name.string,
                     ". _-$", sizeof(tmp));
-       (*server_info)->sanitized_username = talloc_strdup(*server_info, tmp);
+       (*session_info)->unix_info->sanitized_username = talloc_strdup(*session_info, tmp);
 
        status = NT_STATUS_OK;
 done:
        TALLOC_FREE(tmp_ctx);
-       return NT_STATUS_OK;
+       return status;
 }
 
 /***************************************************************************
- Make (and fill) a user_info struct for a system user login.
+ Make (and fill) a auth_session_info struct for a system user login.
  This *must* succeed for smbd to start.
 ***************************************************************************/
 
-static NTSTATUS make_new_server_info_system(TALLOC_CTX *mem_ctx,
-                                           struct auth_serversupplied_info **server_info)
+static NTSTATUS make_new_session_info_system(TALLOC_CTX *mem_ctx,
+                                           struct auth_session_info **session_info)
 {
        struct passwd *pwd;
        NTSTATUS status;
 
        pwd = getpwuid_alloc(mem_ctx, sec_initial_uid());
        if (pwd == NULL) {
-               return NT_STATUS_NO_MEMORY;
+               return NT_STATUS_NO_SUCH_USER;
        }
 
-       status = make_serverinfo_from_username(mem_ctx,
-                                            pwd->pw_name,
-                                            false,
-                                            server_info);
+       status = make_session_info_from_username(mem_ctx,
+                                                pwd->pw_name,
+                                                false,
+                                                session_info);
+       TALLOC_FREE(pwd);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
 
-       (*server_info)->system = true;
+       (*session_info)->unix_info->system = true;
+
+       status = add_sid_to_array_unique((*session_info)->security_token->sids,
+                                        &global_sid_System,
+                                        &(*session_info)->security_token->sids,
+                                        &(*session_info)->security_token->num_sids);
+       if (!NT_STATUS_IS_OK(status)) {
+               TALLOC_FREE((*session_info));
+               return status;
+       }
 
        return NT_STATUS_OK;
 }
 
 /****************************************************************************
-  Fake a auth_serversupplied_info just from a username
+  Fake a auth_session_info just from a username (as a
+  session_info structure, with create_local_token() already called on
+  it.
 ****************************************************************************/
 
-NTSTATUS make_serverinfo_from_username(TALLOC_CTX *mem_ctx,
-                                      const char *username,
-                                      bool is_guest,
-                                      struct auth_serversupplied_info **presult)
+NTSTATUS make_session_info_from_username(TALLOC_CTX *mem_ctx,
+                                        const char *username,
+                                        bool is_guest,
+                                        struct auth_session_info **session_info)
 {
        struct auth_serversupplied_info *result;
        struct passwd *pwd;
        NTSTATUS status;
 
-       pwd = getpwnam_alloc(talloc_tos(), username);
+       pwd = Get_Pwnam_alloc(talloc_tos(), username);
        if (pwd == NULL) {
                return NT_STATUS_NO_SUCH_USER;
        }
@@ -799,20 +962,28 @@ NTSTATUS make_serverinfo_from_username(TALLOC_CTX *mem_ctx,
        result->nss_token = true;
        result->guest = is_guest;
 
-       status = create_local_token(result);
-
-       if (!NT_STATUS_IS_OK(status)) {
-               TALLOC_FREE(result);
-               return status;
-       }
-
-       *presult = result;
-       return NT_STATUS_OK;
+       /* 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);
+       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;
 
@@ -821,48 +992,60 @@ 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) {
-               dst->utok.groups = (gid_t *)TALLOC_MEMDUP(
-                       dst, src->utok.groups,
+       /* 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->unix_token->groups,
                        sizeof(gid_t)*dst->utok.ngroups);
        } else {
                dst->utok.groups = NULL;
        }
 
-       if (src->ptok) {
-               dst->ptok = dup_nt_token(dst, src->ptok);
-               if (!dst->ptok) {
-                       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->user_session_key = data_blob_talloc( dst, src->user_session_key.data,
-                                               src->user_session_key.length);
+       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->pam_handle = NULL;
-       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);
+       dst->sanitized_username = talloc_strdup(dst, src->unix_info->sanitized_username);
        if (!dst->sanitized_username) {
                TALLOC_FREE(dst);
                return NULL;
@@ -871,72 +1054,128 @@ struct auth_serversupplied_info *copy_serverinfo(TALLOC_CTX *mem_ctx,
        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;
+       }
+
+       return dst;
+}
+
 /*
  * Set a new session key. Used in the rpc server where we have to override the
  * SMB level session key with SystemLibraryDTC
  */
 
-bool server_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->user_session_key.data);
+       TALLOC_FREE(info->session_key.data);
 
-       info->user_session_key = data_blob_talloc(
+       info->session_key = data_blob_talloc(
                info, session_key.data, session_key.length);
 
-       return (info->user_session_key.data != NULL);
+       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;
 
-bool init_system_info(void)
+NTSTATUS init_system_info(void)
 {
        if (system_info != NULL)
-               return True;
+               return NT_STATUS_OK;
 
-       return NT_STATUS_IS_OK(make_new_server_info_system(talloc_autofree_context(), &system_info));
+       return make_new_session_info_system(NULL, &system_info);
 }
 
-NTSTATUS make_server_info_system(TALLOC_CTX *mem_ctx,
-                               struct auth_serversupplied_info **server_info)
+NTSTATUS make_session_info_system(TALLOC_CTX *mem_ctx,
+                               struct auth_session_info **session_info)
 {
        if (system_info == NULL) return NT_STATUS_UNSUCCESSFUL;
-       *server_info = copy_serverinfo(mem_ctx, system_info);
-       return (*server_info != NULL) ? NT_STATUS_OK : NT_STATUS_NO_MEMORY;
+       *session_info = copy_session_info(mem_ctx, system_info);
+       return (*session_info != NULL) ? NT_STATUS_OK : NT_STATUS_NO_MEMORY;
+}
+
+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;
-       NT_USER_TOKEN *nt_token;
+       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;
+               return false;
        }
 
        nt_token = dup_nt_token(NULL, src->nt_user_token);
        if (nt_token == NULL) {
                SAFE_FREE(groups);
-               return False;
+               return false;
        }
 
        dst->conn = src->conn;
@@ -946,7 +1185,7 @@ bool copy_current_user(struct current_user *dst, struct current_user *src)
        dst->ut.ngroups = src->ut.ngroups;
        dst->ut.groups = groups;
        dst->nt_user_token = nt_token;
-       return True;
+       return true;
 }
 
 /***************************************************************************
@@ -958,30 +1197,48 @@ static NTSTATUS check_account(TALLOC_CTX *mem_ctx, const char *domain,
                              struct passwd **pwd,
                              bool *username_was_mapped)
 {
-       fstring dom_user, lower_username;
-       fstring real_username;
+       char *orig_dom_user = NULL;
+       char *dom_user = NULL;
+       char *lower_username = NULL;
+       char *real_username = NULL;
        struct passwd *passwd;
 
-       fstrcpy( lower_username, username );
+       lower_username = talloc_strdup(mem_ctx, username);
+       if (!lower_username) {
+               return NT_STATUS_NO_MEMORY;
+       }
        strlower_m( lower_username );
 
-       fstr_sprintf(dom_user, "%s%c%s", domain, *lp_winbind_separator(), 
-               lower_username);
+       orig_dom_user = talloc_asprintf(mem_ctx,
+                               "%s%c%s",
+                               domain,
+                               *lp_winbind_separator(),
+                               lower_username);
+       if (!orig_dom_user) {
+               return NT_STATUS_NO_MEMORY;
+       }
 
        /* Get the passwd struct.  Try to create the account if necessary. */
 
-       *username_was_mapped = map_username(dom_user);
+       *username_was_mapped = map_username(mem_ctx, orig_dom_user, &dom_user);
+       if (!dom_user) {
+               return NT_STATUS_NO_MEMORY;
+       }
 
-       passwd = smb_getpwnam( NULL, 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));
                return NT_STATUS_NO_SUCH_USER;
        }
 
+       if (!real_username) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
        *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?   
@@ -999,31 +1256,31 @@ static NTSTATUS check_account(TALLOC_CTX *mem_ctx, const char *domain,
  ****************************************************************************/
 
 struct passwd *smb_getpwnam( TALLOC_CTX *mem_ctx, const char *domuser,
-                            fstring save_username, bool create )
+                            char **p_save_username, bool create )
 {
        struct passwd *pw = NULL;
-       char *p;
-       fstring username;
+       char *p = NULL;
+       char *username = NULL;
 
        /* we only save a copy of the username it has been mangled 
           by winbindd use default domain */
-
-       save_username[0] = '\0';
+       *p_save_username = NULL;
 
        /* don't call map_username() here since it has to be done higher 
           up the stack so we don't call it multiple times */
 
-       fstrcpy( username, domuser );
+       username = talloc_strdup(mem_ctx, domuser);
+       if (!username) {
+               return NULL;
+       }
 
        p = strchr_m( username, *lp_winbind_separator() );
 
        /* code for a DOMAIN\user string */
 
        if ( p ) {
-               fstring strip_username;
-
                pw = Get_Pwnam_alloc( mem_ctx, domuser );
-               if ( pw ) {     
+               if ( pw ) {
                        /* make sure we get the case of the username correct */
                        /* work around 'winbind use default domain = yes' */
 
@@ -1034,12 +1291,20 @@ struct passwd *smb_getpwnam( TALLOC_CTX *mem_ctx, const char *domuser,
                                *p = '\0';
                                domain = username;
 
-                               fstr_sprintf(save_username, "%s%c%s", domain, *lp_winbind_separator(), pw->pw_name);
+                               *p_save_username = talloc_asprintf(mem_ctx,
+                                                               "%s%c%s",
+                                                               domain,
+                                                               *lp_winbind_separator(),
+                                                               pw->pw_name);
+                               if (!*p_save_username) {
+                                       TALLOC_FREE(pw);
+                                       return NULL;
+                               }
+                       } else {
+                               *p_save_username = talloc_strdup(mem_ctx, pw->pw_name);
                        }
-                       else
-                               fstrcpy( save_username, pw->pw_name );
 
-                       /* whew -- done! */             
+                       /* whew -- done! */
                        return pw;
                }
 
@@ -1047,8 +1312,10 @@ struct passwd *smb_getpwnam( TALLOC_CTX *mem_ctx, const char *domuser,
                /* remember that p and username are overlapping memory */
 
                p++;
-               fstrcpy( strip_username, p );
-               fstrcpy( username, strip_username );
+               username = talloc_strdup(mem_ctx, p);
+               if (!username) {
+                       return NULL;
+               }
        }
 
        /* just lookup a plain username */
@@ -1071,9 +1338,9 @@ struct passwd *smb_getpwnam( TALLOC_CTX *mem_ctx, const char *domuser,
 
        /* one last check for a valid passwd struct */
 
-       if ( pw )
-               fstrcpy( save_username, pw->pw_name );
-
+       if (pw) {
+               *p_save_username = talloc_strdup(mem_ctx, pw->pw_name);
+       }
        return pw;
 }
 
@@ -1167,7 +1434,7 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
        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
+        * we can really use. Obtain the usable 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);
@@ -1196,9 +1463,9 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
        /* ensure we are never given NULL session keys */
 
        if (memcmp(info3->base.key.key, zeros, sizeof(zeros)) == 0) {
-               result->user_session_key = data_blob_null;
+               result->session_key = data_blob_null;
        } else {
-               result->user_session_key = data_blob_talloc(
+               result->session_key = data_blob_talloc(
                        result, info3->base.key.key,
                        sizeof(info3->base.key.key));
        }
@@ -1213,6 +1480,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;
@@ -1256,7 +1525,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;
@@ -1275,7 +1544,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;
@@ -1285,12 +1554,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
@@ -1305,9 +1574,41 @@ 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;
+       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));
+                       status = make_server_info_guest(NULL, server_info);
+               }
+       }
+
+       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));
+                       status = make_server_info_guest(NULL, server_info);
+               }
+       }
+
+       return status;
+}