s3-auth remove sanitized_username from auth_serversupplied_info
[kai/samba-autobuild/.git] / source3 / auth / auth_util.c
index 5e9da4eaff348ba4c511a7c2cc5476629261bd0f..b8cc871b62e8fc9917c9ba9718ee96bdd1be4f5e 100644 (file)
@@ -2,26 +2,36 @@
    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
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.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
@@ -30,7 +40,7 @@
  Create a UNIX user on demand.
 ****************************************************************************/
 
-static int smb_create_user(const char *domain, const char *unix_username, const char *homedir)
+static int _smb_create_user(const char *domain, const char *unix_username, const char *homedir)
 {
        TALLOC_CTX *ctx = talloc_tos();
        char *add_script;
@@ -74,132 +84,69 @@ static int smb_create_user(const char *domain, const char *unix_username, const
 }
 
 /****************************************************************************
- Create an auth_usersupplied_data structure
+ Create an auth_usersupplied_data structure after appropriate mapping.
 ****************************************************************************/
 
-static NTSTATUS make_user_info(auth_usersupplied_info **user_info,
-                               const char *smb_name,
-                               const char *internal_username,
-                               const char *client_domain,
-                               const char *domain,
-                               const char *wksta_name,
-                               DATA_BLOB *lm_pwd, DATA_BLOB *nt_pwd,
-                               DATA_BLOB *lm_interactive_pwd, DATA_BLOB *nt_interactive_pwd,
-                               DATA_BLOB *plaintext,
-                               bool encrypted)
+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,
+                           const struct samr_Password *nt_interactive_pwd,
+                           const char *plaintext,
+                           enum auth_password_state password_state)
 {
+       const char *domain;
+       NTSTATUS result;
+       bool was_mapped;
+       char *internal_username = NULL;
 
-       DEBUG(5,("attempting to make a user_info for %s (%s)\n", internal_username, smb_name));
-
-       *user_info = SMB_MALLOC_P(auth_usersupplied_info);
-       if (*user_info == NULL) {
-               DEBUG(0,("malloc failed for user_info (size %lu)\n", (unsigned long)sizeof(*user_info)));
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       ZERO_STRUCTP(*user_info);
-
-       DEBUG(5,("making strings for %s's user_info struct\n", internal_username));
-
-       (*user_info)->smb_name = SMB_STRDUP(smb_name);
-       if ((*user_info)->smb_name == NULL) { 
-               free_user_info(user_info);
-               return NT_STATUS_NO_MEMORY;
-       }
-       
-       (*user_info)->internal_username = SMB_STRDUP(internal_username);
-       if ((*user_info)->internal_username == NULL) { 
-               free_user_info(user_info);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       (*user_info)->domain = SMB_STRDUP(domain);
-       if ((*user_info)->domain == NULL) { 
-               free_user_info(user_info);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       (*user_info)->client_domain = SMB_STRDUP(client_domain);
-       if ((*user_info)->client_domain == NULL) { 
-               free_user_info(user_info);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       (*user_info)->wksta_name = SMB_STRDUP(wksta_name);
-       if ((*user_info)->wksta_name == NULL) { 
-               free_user_info(user_info);
+       was_mapped = map_username(talloc_tos(), smb_name, &internal_username);
+       if (!internal_username) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       DEBUG(5,("making blobs for %s's user_info struct\n", internal_username));
+       DEBUG(5, ("Mapping user [%s]\\[%s] from workstation [%s]\n",
+                client_domain, smb_name, workstation_name));
 
-       if (lm_pwd)
-               (*user_info)->lm_resp = data_blob(lm_pwd->data, lm_pwd->length);
-       if (nt_pwd)
-               (*user_info)->nt_resp = data_blob(nt_pwd->data, nt_pwd->length);
-       if (lm_interactive_pwd)
-               (*user_info)->lm_interactive_pwd = data_blob(lm_interactive_pwd->data, lm_interactive_pwd->length);
-       if (nt_interactive_pwd)
-               (*user_info)->nt_interactive_pwd = data_blob(nt_interactive_pwd->data, nt_interactive_pwd->length);
-
-       if (plaintext)
-               (*user_info)->plaintext_password = data_blob(plaintext->data, plaintext->length);
-
-       (*user_info)->encrypted = encrypted;
-
-       (*user_info)->logon_parameters = 0;
-
-       DEBUG(10,("made an %sencrypted user_info for %s (%s)\n", encrypted ? "":"un" , internal_username, smb_name));
-
-       return NT_STATUS_OK;
-}
+       domain = client_domain;
 
-/****************************************************************************
- Create an auth_usersupplied_data structure after appropriate mapping.
-****************************************************************************/
+       /* If you connect to a Windows domain member using a bogus domain name,
+        * the Windows box will map the BOGUS\user to SAMNAME\user.  Thus, if
+        * the Windows box is a DC the name will become DOMAIN\user and be
+        * authenticated against AD, if the Windows box is a member server but
+        * not a DC the name will become WORKSTATION\user.  A standalone
+        * non-domain member box will also map to WORKSTATION\user.
+        * This also deals with the client passing in a "" domain */
 
-NTSTATUS make_user_info_map(auth_usersupplied_info **user_info, 
-                           const char *smb_name, 
-                           const char *client_domain, 
-                           const char *wksta_name, 
-                           DATA_BLOB *lm_pwd, DATA_BLOB *nt_pwd,
-                           DATA_BLOB *lm_interactive_pwd, DATA_BLOB *nt_interactive_pwd,
-                           DATA_BLOB *plaintext, 
-                           bool encrypted)
-{
-       const char *domain;
-       NTSTATUS result;
-       bool was_mapped;
-       fstring internal_username;
-       fstrcpy(internal_username, smb_name);
-       was_mapped = map_username(internal_username); 
-       
-       DEBUG(5, ("make_user_info_map: Mapping user [%s]\\[%s] from workstation [%s]\n",
-             client_domain, smb_name, wksta_name));
-       
-       /* don't allow "" as a domain, fixes a Win9X bug 
-          where it doens't supply a domain for logon script
-          'net use' commands.                                 */
-
-       if ( *client_domain )
-               domain = client_domain;
-       else
-               domain = lp_workgroup();
-
-       /* do what win2k does.  Always map unknown domains to our own
-          and let the "passdb backend" handle unknown users. */
-
-       if ( !is_trusted_domain(domain) && !strequal(domain, get_global_sam_name()) ) 
-               domain = my_sam_name();
-       
-       /* we know that it is a trusted domain (and we are allowing them) or it is our domain */
-       
-       result = make_user_info(user_info, smb_name, internal_username, 
-                             client_domain, domain, wksta_name, 
-                             lm_pwd, nt_pwd,
+       if (!is_trusted_domain(domain) &&
+           !strequal(domain, my_sam_name()))
+       {
+               if (lp_map_untrusted_to_domain())
+                       domain = my_sam_name();
+               else
+                       domain = get_global_sam_name();
+               DEBUG(5, ("Mapped domain from [%s] to [%s] for user [%s] from "
+                         "workstation [%s]\n",
+                         client_domain, domain, smb_name, workstation_name));
+       }
+
+       /* We know that the given domain is trusted (and we are allowing them),
+        * it is our global SAM name, or for legacy behavior it is our
+        * primary domain name */
+
+       result = make_user_info(user_info, smb_name, internal_username,
+                             client_domain, domain, workstation_name,
+                             remote_address, lm_pwd, nt_pwd,
                              lm_interactive_pwd, nt_interactive_pwd,
-                             plaintext, encrypted);
+                             plaintext, password_state);
        if (NT_STATUS_IS_OK(result)) {
+               /* We have tried mapping */
+               (*user_info)->mapped_state = true;
+               /* did we actually map the user to a different name? */
                (*user_info)->was_mapped = was_mapped;
        }
        return result;
@@ -210,10 +157,11 @@ NTSTATUS make_user_info_map(auth_usersupplied_info **user_info,
  Decrypt and encrypt the passwords.
 ****************************************************************************/
 
-bool make_user_info_netlogon_network(auth_usersupplied_info **user_info, 
+bool make_user_info_netlogon_network(struct auth_usersupplied_info **user_info,
                                     const char *smb_name, 
                                     const char *client_domain, 
-                                    const char *wksta_name, 
+                                    const char *workstation_name,
+                                    const struct tsocket_address *remote_address,
                                     uint32 logon_parameters,
                                     const uchar *lm_network_pwd,
                                     int lm_pwd_len,
@@ -227,16 +175,17 @@ bool make_user_info_netlogon_network(auth_usersupplied_info **user_info,
 
        status = make_user_info_map(user_info,
                                    smb_name, client_domain, 
-                                   wksta_name, 
+                                   workstation_name,
+                                   remote_address,
                                    lm_pwd_len ? &lm_blob : NULL, 
                                    nt_pwd_len ? &nt_blob : NULL,
                                    NULL, NULL, NULL,
-                                   True);
+                                   AUTH_PASSWORD_RESPONSE);
 
        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);
@@ -248,64 +197,64 @@ bool make_user_info_netlogon_network(auth_usersupplied_info **user_info,
  Decrypt and encrypt the passwords.
 ****************************************************************************/
 
-bool make_user_info_netlogon_interactive(auth_usersupplied_info **user_info, 
+bool make_user_info_netlogon_interactive(struct auth_usersupplied_info **user_info,
                                         const char *smb_name, 
                                         const char *client_domain, 
-                                        const char *wksta_name, 
+                                        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)
 {
-       unsigned char lm_pwd[16];
-       unsigned char nt_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];
-       
-       ZERO_STRUCT(key);
-       memcpy(key, dc_sess_key, 8);
-       
+
+       memcpy(key, dc_sess_key, 16);
+
        if (lm_interactive_pwd)
-               memcpy(lm_pwd, lm_interactive_pwd, sizeof(lm_pwd));
+               memcpy(lm_pwd.hash, lm_interactive_pwd, sizeof(lm_pwd.hash));
 
        if (nt_interactive_pwd)
-               memcpy(nt_pwd, nt_interactive_pwd, sizeof(nt_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, sizeof(lm_pwd));
-       
+       dump_data(100, lm_pwd.hash, sizeof(lm_pwd.hash));
+
        DEBUG(100,("nt owf password:"));
-       dump_data(100, nt_pwd, sizeof(nt_pwd));
+       dump_data(100, nt_pwd.hash, sizeof(nt_pwd.hash));
 #endif
-       
+
        if (lm_interactive_pwd)
-               SamOEMhash(lm_pwd, key, sizeof(lm_pwd));
-       
+               arcfour_crypt(lm_pwd.hash, key, sizeof(lm_pwd.hash));
+
        if (nt_interactive_pwd)
-               SamOEMhash(nt_pwd, key, sizeof(nt_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, sizeof(lm_pwd));
-       
+       dump_data(100, lm_pwd.hash, sizeof(lm_pwd));
+
        DEBUG(100,("decrypt of nt owf password:"));
-       dump_data(100, nt_pwd, sizeof(nt_pwd));
+       dump_data(100, nt_pwd.hash, sizeof(nt_pwd));
 #endif
-       
+
        if (lm_interactive_pwd)
-               SMBOWFencrypt(lm_pwd, chal,
+               SMBOWFencrypt(lm_pwd.hash, chal,
                              local_lm_response);
 
        if (nt_interactive_pwd)
-               SMBOWFencrypt(nt_pwd, chal,
+               SMBOWFencrypt(nt_pwd.hash, chal,
                              local_nt_response);
-       
+
        /* Password info paranoia */
        ZERO_STRUCT(key);
 
@@ -315,43 +264,33 @@ bool make_user_info_netlogon_interactive(auth_usersupplied_info **user_info,
                DATA_BLOB local_lm_blob;
                DATA_BLOB local_nt_blob;
 
-               DATA_BLOB lm_interactive_blob;
-               DATA_BLOB nt_interactive_blob;
-               
                if (lm_interactive_pwd) {
                        local_lm_blob = data_blob(local_lm_response,
                                                  sizeof(local_lm_response));
-                       lm_interactive_blob = data_blob(lm_pwd,
-                                                       sizeof(lm_pwd));
-                       ZERO_STRUCT(lm_pwd);
                }
-               
+
                if (nt_interactive_pwd) {
                        local_nt_blob = data_blob(local_nt_response,
                                                  sizeof(local_nt_response));
-                       nt_interactive_blob = data_blob(nt_pwd,
-                                                       sizeof(nt_pwd));
-                       ZERO_STRUCT(nt_pwd);
                }
 
                nt_status = make_user_info_map(
                        user_info, 
-                       smb_name, client_domain, wksta_name, 
+                       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_interactive_blob : NULL,
-                       nt_interactive_pwd ? &nt_interactive_blob : NULL,
-                       NULL, True);
+                       lm_interactive_pwd ? &lm_pwd : NULL,
+                       nt_interactive_pwd ? &nt_pwd : NULL,
+                       NULL, AUTH_PASSWORD_HASH);
 
                if (NT_STATUS_IS_OK(nt_status)) {
                        (*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);
-               data_blob_free(&lm_interactive_blob);
-               data_blob_free(&nt_interactive_blob);
                return ret;
        }
 }
@@ -361,9 +300,10 @@ bool make_user_info_netlogon_interactive(auth_usersupplied_info **user_info,
  Create an auth_usersupplied_data structure
 ****************************************************************************/
 
-bool make_user_info_for_reply(auth_usersupplied_info **user_info, 
+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)
 {
@@ -371,17 +311,16 @@ bool make_user_info_for_reply(auth_usersupplied_info **user_info,
        DATA_BLOB local_lm_blob;
        DATA_BLOB local_nt_blob;
        NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
-                       
+       char *plaintext_password_string;
        /*
         * Not encrypted - do so.
         */
-       
+
        DEBUG(5,("make_user_info_for_reply: User passwords not in encrypted "
                 "format.\n"));
-       
-       if (plaintext_password.data) {
+       if (plaintext_password.data && plaintext_password.length) {
                unsigned char local_lm_response[24];
-               
+
 #ifdef DEBUG_PASSWORD
                DEBUG(10,("Unencrypted password (len %d):\n",
                          (int)plaintext_password.length));
@@ -392,52 +331,67 @@ bool make_user_info_for_reply(auth_usersupplied_info **user_info,
                SMBencrypt( (const char *)plaintext_password.data,
                            (const uchar*)chal, local_lm_response);
                local_lm_blob = data_blob(local_lm_response, 24);
-               
+
                /* We can't do an NT hash here, as the password needs to be
                   case insensitive */
                local_nt_blob = data_blob_null; 
-               
        } else {
                local_lm_blob = data_blob_null; 
                local_nt_blob = data_blob_null; 
        }
-       
+
+       plaintext_password_string = talloc_strndup(talloc_tos(),
+                                                  (const char *)plaintext_password.data,
+                                                  plaintext_password.length);
+       if (!plaintext_password_string) {
+               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,
-               plaintext_password.data ? &plaintext_password : NULL, 
-               False);
-       
+               plaintext_password_string,
+               AUTH_PASSWORD_PLAIN);
+
+       if (plaintext_password_string) {
+               memset(plaintext_password_string, '\0', strlen(plaintext_password_string));
+               talloc_free(plaintext_password_string);
+       }
+
        data_blob_free(&local_lm_blob);
-       return NT_STATUS_IS_OK(ret) ? True : False;
+       return NT_STATUS_IS_OK(ret) ? true : false;
 }
 
 /****************************************************************************
  Create an auth_usersupplied_data structure
 ****************************************************************************/
 
-NTSTATUS make_user_info_for_reply_enc(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 : NULL, 
-                                 nt_resp.data ? &nt_resp : NULL, 
+                                 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,
-                                 True);
+                                 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(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;
 
@@ -445,593 +399,286 @@ bool make_user_info_guest(auth_usersupplied_info **user_info)
                                   "","", 
                                   "","", 
                                   "", 
+                                  remote_address,
                                   NULL, NULL, 
                                   NULL, NULL, 
                                   NULL,
-                                  True);
-                             
-       return NT_STATUS_IS_OK(nt_status) ? True : False;
-}
+                                  AUTH_PASSWORD_RESPONSE);
 
-static int server_info_dtor(auth_serversupplied_info *server_info)
-{
-       TALLOC_FREE(server_info->sam_account);
-       ZERO_STRUCTP(server_info);
-       return 0;
-}
-
-/***************************************************************************
- Make a server_info struct. Free with TALLOC_FREE().
-***************************************************************************/
-
-static auth_serversupplied_info *make_server_info(TALLOC_CTX *mem_ctx)
-{
-       struct auth_serversupplied_info *result;
-
-       result = TALLOC_ZERO_P(mem_ctx, auth_serversupplied_info);
-       if (result == NULL) {
-               DEBUG(0, ("talloc failed\n"));
-               return NULL;
-       }
-
-       talloc_set_destructor(result, server_info_dtor);
-
-       /* Initialise the uid and gid values to something non-zero
-          which may save us from giving away root access if there
-          is a bug in allocating these fields. */
-
-       result->uid = -1;
-       result->gid = -1;
-       return result;
-}
-
-/***************************************************************************
- Make (and fill) a user_info struct from a struct samu
-***************************************************************************/
-
-NTSTATUS make_server_info_sam(auth_serversupplied_info **server_info, 
-                             struct samu *sampass)
-{
-       NTSTATUS status;
-       struct passwd *pwd;
-       gid_t *gids;
-       auth_serversupplied_info *result;
-       int i;
-       size_t num_gids;
-       DOM_SID unix_group_sid;
-       
-
-       if ( !(result = make_server_info(NULL)) ) {
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       if ( !(pwd = getpwnam_alloc(result, pdb_get_username(sampass))) ) {
-               DEBUG(1, ("User %s in passdb, but getpwnam() fails!\n",
-                         pdb_get_username(sampass)));
-               TALLOC_FREE(result);
-               return NT_STATUS_NO_SUCH_USER;
-       }
-
-       result->sam_account = sampass;
-       /* Ensure thaat the sampass will be freed with the result */
-       talloc_steal(result, sampass);
-       result->unix_name = pwd->pw_name;
-       /* Ensure that we keep pwd->pw_name, because we will free pwd below */
-       talloc_steal(result, pwd->pw_name);
-       result->gid = pwd->pw_gid;
-       result->uid = pwd->pw_uid;
-       
-       TALLOC_FREE(pwd);
-
-       status = pdb_enum_group_memberships(result, sampass,
-                                           &result->sids, &gids,
-                                           &result->num_sids);
-
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(10, ("pdb_enum_group_memberships failed: %s\n",
-                          nt_errstr(status)));
-               result->sam_account = NULL; /* Don't free on error exit. */
-               TALLOC_FREE(result);
-               return status;
-       }
-       
-       /* Add the "Unix Group" SID for each gid to catch mapped groups
-          and their Unix equivalent.  This is to solve the backwards 
-          compatibility problem of 'valid users = +ntadmin' where 
-          ntadmin has been paired with "Domain Admins" in the group 
-          mapping table.  Otherwise smb.conf would need to be changed
-          to 'valid user = "Domain Admins"'.  --jerry */
-       
-       num_gids = result->num_sids;
-       for ( i=0; i<num_gids; i++ ) {
-               if ( !gid_to_unix_groups_sid( gids[i], &unix_group_sid ) ) {
-                       DEBUG(1,("make_server_info_sam: Failed to create SID "
-                               "for gid %d!\n", gids[i]));
-                       continue;
-               }
-               status = add_sid_to_array_unique(result, &unix_group_sid,
-                                                &result->sids,
-                                                &result->num_sids);
-               if (!NT_STATUS_IS_OK(status)) {
-                       result->sam_account = NULL; /* Don't free on error exit. */
-                       TALLOC_FREE(result);
-                       return status;
-               }
-       }
-
-       /* For now we throw away the gids and convert via sid_to_gid
-        * later. This needs fixing, but I'd like to get the code straight and
-        * simple first. */
-        
-       TALLOC_FREE(gids);
-
-       DEBUG(5,("make_server_info_sam: made server info for user %s -> %s\n",
-                pdb_get_username(sampass), result->unix_name));
-
-       *server_info = result;
-
-       return NT_STATUS_OK;
+       return NT_STATUS_IS_OK(nt_status) ? true : false;
 }
 
-static NTSTATUS log_nt_token(TALLOC_CTX *tmp_ctx, NT_USER_TOKEN *token)
+static NTSTATUS log_nt_token(struct security_token *token)
 {
+       TALLOC_CTX *frame = talloc_stackframe();
        char *command;
        char *group_sidstr;
        size_t i;
 
        if ((lp_log_nt_token_command() == NULL) ||
            (strlen(lp_log_nt_token_command()) == 0)) {
+               TALLOC_FREE(frame);
                return NT_STATUS_OK;
        }
 
-       group_sidstr = talloc_strdup(tmp_ctx, "");
+       group_sidstr = talloc_strdup(frame, "");
        for (i=1; i<token->num_sids; i++) {
                group_sidstr = talloc_asprintf(
-                       tmp_ctx, "%s %s", group_sidstr,
-                       sid_string_talloc(tmp_ctx, &token->user_sids[i]));
+                       frame, "%s %s", group_sidstr,
+                       sid_string_talloc(frame, &token->sids[i]));
        }
 
        command = talloc_string_sub(
-               tmp_ctx, lp_log_nt_token_command(),
-               "%s", sid_string_talloc(tmp_ctx, &token->user_sids[0]));
-       command = talloc_string_sub(tmp_ctx, command, "%t", group_sidstr);
+               frame, lp_log_nt_token_command(),
+               "%s", sid_string_talloc(frame, &token->sids[0]));
+       command = talloc_string_sub(frame, command, "%t", group_sidstr);
 
        if (command == NULL) {
+               TALLOC_FREE(frame);
                return NT_STATUS_NO_MEMORY;
        }
 
        DEBUG(8, ("running command: [%s]\n", command));
        if (smbrun(command, NULL) != 0) {
                DEBUG(0, ("Could not log NT token\n"));
+               TALLOC_FREE(frame);
                return NT_STATUS_ACCESS_DENIED;
        }
 
+       TALLOC_FREE(frame);
        return NT_STATUS_OK;
 }
 
 /*
- * Create the token to use from server_info->sam_account and
+ * Create the token to use from server_info->info3 and
  * server_info->sids (the info3/sam groups). Find the unix gids.
  */
 
-NTSTATUS create_local_token(auth_serversupplied_info *server_info)
+NTSTATUS create_local_token(TALLOC_CTX *mem_ctx,
+                           const struct auth_serversupplied_info *server_info,
+                           DATA_BLOB *session_key,
+                           const char *smb_username, /* for ->sanitized_username, for %U subs */
+                           struct auth_session_info **session_info_out)
 {
-       TALLOC_CTX *mem_ctx;
+       struct security_token *t;
        NTSTATUS status;
        size_t i;
-       
-
-       mem_ctx = talloc_new(NULL);
-       if (mem_ctx == NULL) {
-               DEBUG(0, ("talloc_new failed\n"));
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       /*
-        * If winbind is not around, we can not make much use of the SIDs the
-        * domain controller provided us with. Likewise if the user name was
-        * mapped to some local unix user.
-        */
-
-       if (((lp_server_role() == ROLE_DOMAIN_MEMBER) && !winbind_ping()) ||
-           (server_info->nss_token)) {
-               status = create_token_from_username(server_info,
-                                                   server_info->unix_name,
-                                                   server_info->guest,
-                                                   &server_info->uid,
-                                                   &server_info->gid,
-                                                   &server_info->unix_name,
-                                                   &server_info->ptok);
-               
-       } else {
-               server_info->ptok = create_local_nt_token(
-                       server_info,
-                       pdb_get_user_sid(server_info->sam_account),
-                       server_info->guest,
-                       server_info->num_sids, server_info->sids);
-               status = server_info->ptok ?
-                       NT_STATUS_OK : NT_STATUS_NO_SUCH_USER;
-       }
+       struct dom_sid tmp_sid;
+       struct auth_session_info *session_info;
+       struct wbcUnixId *ids;
+       fstring tmp;
 
-       if (!NT_STATUS_IS_OK(status)) {
-               TALLOC_FREE(mem_ctx);
-               return status;
+       /* Ensure we can't possible take a code path leading to a
+        * null defref. */
+       if (!server_info) {
+               return NT_STATUS_LOGON_FAILURE;
        }
-       
-       /* Convert the SIDs to gids. */
 
-       server_info->n_groups = 0;
-       server_info->groups = NULL;
-
-       /* Start at index 1, where the groups start. */
-
-       for (i=1; i<server_info->ptok->num_sids; i++) {
-               gid_t gid;
-               DOM_SID *sid = &server_info->ptok->user_sids[i];
-
-               if (!sid_to_gid(sid, &gid)) {
-                       DEBUG(10, ("Could not convert SID %s to gid, "
-                                  "ignoring it\n", sid_string_dbg(sid)));
-                       continue;
-               }
-               add_gid_to_array_unique(server_info, gid, &server_info->groups,
-                                       &server_info->n_groups);
+       session_info = talloc_zero(mem_ctx, struct auth_session_info);
+       if (!session_info) {
+               return NT_STATUS_NO_MEMORY;
        }
-       
-       debug_nt_user_token(DBGC_AUTH, 10, server_info->ptok);
-
-       status = log_nt_token(mem_ctx, server_info->ptok);
-
-       TALLOC_FREE(mem_ctx);
-       return status;
-}
-
-/*
- * Create an artificial NT token given just a username. (Initially indended
- * for force user)
- *
- * We go through lookup_name() to avoid problems we had with 'winbind use
- * default domain'.
- *
- * We have 3 cases:
- *
- * unmapped unix users: Go directly to nss to find the user's group.
- *
- * A passdb user: The list of groups is provided by pdb_enum_group_memberships.
- *
- * If the user is provided by winbind, the primary gid is set to "domain
- * users" of the user's domain. For an explanation why this is necessary, see
- * the thread starting at
- * http://lists.samba.org/archive/samba-technical/2006-January/044803.html.
- */
-
-NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
-                                   bool is_guest,
-                                   uid_t *uid, gid_t *gid,
-                                   char **found_username,
-                                   struct nt_user_token **token)
-{
-       NTSTATUS result = NT_STATUS_NO_SUCH_USER;
-       TALLOC_CTX *tmp_ctx;
-       DOM_SID user_sid;
-       enum lsa_SidType type;
-       gid_t *gids;
-       DOM_SID *group_sids;
-       DOM_SID unix_group_sid;
-       size_t num_group_sids;
-       size_t num_gids;
-       size_t i;
 
-       tmp_ctx = talloc_new(NULL);
-       if (tmp_ctx == NULL) {
-               DEBUG(0, ("talloc_new failed\n"));
+       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;
        }
 
-       if (!lookup_name_smbconf(tmp_ctx, username, LOOKUP_NAME_ALL,
-                        NULL, NULL, &user_sid, &type)) {
-               DEBUG(1, ("lookup_name_smbconf for %s failed\n", username));
-               goto done;
-       }
+       session_info->unix_token->uid = server_info->utok.uid;
+       session_info->unix_token->gid = server_info->utok.gid;
 
-       if (type != SID_NAME_USER) {
-               DEBUG(1, ("%s is a %s, not a user\n", username,
-                         sid_type_lookup(type)));
-               goto done;
+       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;
        }
 
-       if (!sid_to_uid(&user_sid, uid)) {
-               DEBUG(1, ("sid_to_uid for %s (%s) failed\n",
-                         username, sid_string_dbg(&user_sid)));
-               goto done;
+       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;
        }
 
-       if (sid_check_is_in_our_domain(&user_sid)) {
-               bool ret;
-
-               /* This is a passdb user, so ask passdb */
-
-               struct samu *sam_acct = NULL;
-
-               if ( !(sam_acct = samu_new( tmp_ctx )) ) {
-                       result = NT_STATUS_NO_MEMORY;
-                       goto done;
-               }
-
-               become_root();
-               ret = pdb_getsampwsid(sam_acct, &user_sid);
-               unbecome_root();
+       /* 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 (!ret) {
-                       DEBUG(1, ("pdb_getsampwsid(%s) for user %s failed\n",
-                                 sid_string_dbg(&user_sid), username));
-                       DEBUGADD(1, ("Fall back to unix user %s\n", username));
-                       goto unix_user;
-               }
+       session_info->unix_info->system = server_info->system;
 
-               result = pdb_enum_group_memberships(tmp_ctx, sam_acct,
-                                                   &group_sids, &gids,
-                                                   &num_group_sids);
-               if (!NT_STATUS_IS_OK(result)) {
-                       DEBUG(10, ("enum_group_memberships failed for %s\n",
-                                  username));
-                       DEBUGADD(1, ("Fall back to unix user %s\n", username));
-                       goto unix_user;
+       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);
+       }
 
-               /* see the smb_panic() in pdb_default_enum_group_memberships */
-               SMB_ASSERT(num_group_sids > 0); 
-
-               *gid = gids[0];
-
-               /* Ensure we're returning the found_username on the right context. */
-               *found_username = talloc_strdup(mem_ctx,
-                                               pdb_get_username(sam_acct));
-
-       } else  if (sid_check_is_in_unix_users(&user_sid)) {
-
-               /* This is a unix user not in passdb. We need to ask nss
-                * directly, without consulting passdb */
-
-               struct passwd *pass;
-
-               /*
-                * This goto target is used as a fallback for the passdb
-                * case. The concrete bug report is when passdb gave us an
-                * unmapped gid.
-                */
-
-       unix_user:
-
-               uid_to_unix_users_sid(*uid, &user_sid);
-
-               pass = getpwuid_alloc(tmp_ctx, *uid);
-               if (pass == NULL) {
-                       DEBUG(1, ("getpwuid(%d) for user %s failed\n",
-                                 *uid, username));
-                       goto done;
-               }
+       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) */
 
-               if (!getgroups_unix_user(tmp_ctx, username, pass->pw_gid,
-                                        &gids, &num_group_sids)) {
-                       DEBUG(1, ("getgroups_unix_user for user %s failed\n",
-                                 username));
-                       goto done;
+               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;
                }
 
-               if (num_group_sids) {
-                       group_sids = TALLOC_ARRAY(tmp_ctx, DOM_SID, num_group_sids);
-                       if (group_sids == NULL) {
-                               DEBUG(1, ("TALLOC_ARRAY failed\n"));
-                               result = NT_STATUS_NO_MEMORY;
-                               goto done;
-                       }
+               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 {
-                       group_sids = NULL;
+                       session_info->unix_token->groups = NULL;
                }
 
-               for (i=0; i<num_group_sids; i++) {
-                       gid_to_sid(&group_sids[i], gids[i]);
-               }
+               *session_info_out = session_info;
+               return NT_STATUS_OK;
+       }
 
-               /* In getgroups_unix_user we always set the primary gid */
-               SMB_ASSERT(num_group_sids > 0); 
+       /* 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;
+       }
 
-               *gid = gids[0];
+       /*
+        * If winbind is not around, we can not make much use of the SIDs the
+        * domain controller provided us with. Likewise if the user name was
+        * mapped to some local unix user.
+        */
 
-               /* Ensure we're returning the found_username on the right context. */
-               *found_username = talloc_strdup(mem_ctx, pass->pw_name);
+       if (((lp_server_role() == ROLE_DOMAIN_MEMBER) && !winbind_ping()) ||
+           (server_info->nss_token)) {
+               char *found_username = NULL;
+               status = create_token_from_username(session_info,
+                                                   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,
+                                                         server_info->guest,
+                                                         server_info->info3,
+                                                         &server_info->extra,
+                                                         &session_info->security_token);
+       }
 
-               /* This user is from winbind, force the primary gid to the
-                * user's "domain users" group. Under certain circumstances
-                * (user comes from NT4), this might be a loss of
-                * information. But we can not rely on winbind getting the
-                * correct info. AD might prohibit winbind looking up that
-                * information. */
-
-               uint32 dummy;
-
-               num_group_sids = 1;
-               group_sids = TALLOC_ARRAY(tmp_ctx, DOM_SID, num_group_sids);
-               if (group_sids == NULL) {
-                       DEBUG(1, ("TALLOC_ARRAY failed\n"));
-                       result = NT_STATUS_NO_MEMORY;
-                       goto done;
-               }
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
 
-               sid_copy(&group_sids[0], &user_sid);
-               sid_split_rid(&group_sids[0], &dummy);
-               sid_append_rid(&group_sids[0], DOMAIN_GROUP_RID_USERS);
+       /* Convert the SIDs to gids. */
 
-               if (!sid_to_gid(&group_sids[0], gid)) {
-                       DEBUG(1, ("sid_to_gid(%s) failed\n",
-                                 sid_string_dbg(&group_sids[0])));
-                       goto done;
-               }
+       session_info->unix_token->ngroups = 0;
+       session_info->unix_token->groups = NULL;
 
-               gids = gid;
+       t = session_info->security_token;
 
-               /* Ensure we're returning the found_username on the right context. */
-               *found_username = talloc_strdup(mem_ctx, username);
+       ids = talloc_array(talloc_tos(), struct wbcUnixId,
+                          t->num_sids);
+       if (ids == NULL) {
+               return NT_STATUS_NO_MEMORY;
        }
 
-       /* Add the "Unix Group" SID for each gid to catch mapped groups
-          and their Unix equivalent.  This is to solve the backwards
-          compatibility problem of 'valid users = +ntadmin' where
-          ntadmin has been paired with "Domain Admins" in the group
-          mapping table.  Otherwise smb.conf would need to be changed
-          to 'valid user = "Domain Admins"'.  --jerry */
-
-       num_gids = num_group_sids;
-       for ( i=0; i<num_gids; i++ ) {
-               gid_t high, low;
+       if (!sids_to_unix_ids(t->sids, t->num_sids, ids)) {
+               TALLOC_FREE(ids);
+               return NT_STATUS_NO_MEMORY;
+       }
 
-               /* don't pickup anything managed by Winbind */
+       /* Start at index 1, where the groups start. */
 
-               if ( lp_idmap_gid(&low, &high) && (gids[i] >= low) && (gids[i] <= high) )
-                       continue;
+       for (i=1; i<t->num_sids; i++) {
 
-               if ( !gid_to_unix_groups_sid( gids[i], &unix_group_sid ) ) {
-                       DEBUG(1,("create_token_from_username: Failed to create SID "
-                               "for gid %d!\n", gids[i]));
+               if (ids[i].type != WBC_ID_TYPE_GID) {
+                       DEBUG(10, ("Could not convert SID %s to gid, "
+                                  "ignoring it\n",
+                                  sid_string_dbg(&t->sids[i])));
                        continue;
                }
-               result = add_sid_to_array_unique(tmp_ctx, &unix_group_sid,
-                                                &group_sids, &num_group_sids);
-               if (!NT_STATUS_IS_OK(result)) {
-                       goto done;
+               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;
                }
        }
 
-       /* Ensure we're creating the nt_token on the right context. */
-       *token = create_local_nt_token(mem_ctx, &user_sid,
-                                      is_guest, num_group_sids, group_sids);
-
-       if ((*token == NULL) || (*found_username == NULL)) {
-               result = NT_STATUS_NO_MEMORY;
-               goto done;
-       }
-
-       result = NT_STATUS_OK;
- done:
-       TALLOC_FREE(tmp_ctx);
-       return result;
-}
-
-/***************************************************************************
- Build upon create_token_from_username:
-
- Expensive helper function to figure out whether a user given its name is
- member of a particular group.
-***************************************************************************/
+       /*
+        * Add the "Unix Group" SID for each gid to catch mapped groups
+        * and their Unix equivalent.  This is to solve the backwards
+        * compatibility problem of 'valid users = +ntadmin' where
+        * ntadmin has been paired with "Domain Admins" in the group
+        * mapping table.  Otherwise smb.conf would need to be changed
+        * to 'valid user = "Domain Admins"'.  --jerry
+        *
+        * For consistency we also add the "Unix User" SID,
+        * so that the complete unix token is represented within
+        * the nt token.
+        */
 
-bool user_in_group_sid(const char *username, const DOM_SID *group_sid)
-{
-       NTSTATUS status;
-       uid_t uid;
-       gid_t gid;
-       char *found_username;
-       struct nt_user_token *token;
-       bool result;
+       uid_to_unix_users_sid(session_info->unix_token->uid, &tmp_sid);
 
-       TALLOC_CTX *mem_ctx;
+       add_sid_to_array_unique(session_info->security_token, &tmp_sid,
+                               &session_info->security_token->sids,
+                               &session_info->security_token->num_sids);
 
-       mem_ctx = talloc_new(NULL);
-       if (mem_ctx == NULL) {
-               DEBUG(0, ("talloc_new failed\n"));
-               return False;
+       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);
        }
 
-       status = create_token_from_username(mem_ctx, username, False,
-                                           &uid, &gid, &found_username,
-                                           &token);
+       security_token_debug(DBGC_AUTH, 10, session_info->security_token);
+       debug_unix_user_token(DBGC_AUTH, 10,
+                             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)) {
-               DEBUG(10, ("could not create token for %s\n", username));
-               return False;
-       }
-
-       result = nt_token_check_sid(group_sid, token);
-
-       TALLOC_FREE(mem_ctx);
-       return result;
-       
-}
-
-bool user_in_group(const char *username, const char *groupname)
-{
-       TALLOC_CTX *mem_ctx;
-       DOM_SID group_sid;
-       bool ret;
-
-       mem_ctx = talloc_new(NULL);
-       if (mem_ctx == NULL) {
-               DEBUG(0, ("talloc_new failed\n"));
-               return False;
-       }
-
-       ret = lookup_name(mem_ctx, groupname, LOOKUP_NAME_ALL,
-                         NULL, NULL, &group_sid, NULL);
-       TALLOC_FREE(mem_ctx);
-
-       if (!ret) {
-               DEBUG(10, ("lookup_name for (%s) failed.\n", groupname));
-               return False;
+               return status;
        }
 
-       return user_in_group_sid(username, &group_sid);
+       *session_info_out = session_info;
+       return NT_STATUS_OK;
 }
 
-
 /***************************************************************************
  Make (and fill) a server_info struct from a 'struct passwd' by conversion
  to a struct samu
 ***************************************************************************/
 
-NTSTATUS make_server_info_pw(auth_serversupplied_info **server_info, 
+NTSTATUS make_server_info_pw(struct auth_serversupplied_info **server_info,
                              char *unix_username,
                             struct passwd *pwd)
 {
        NTSTATUS status;
        struct samu *sampass = NULL;
-       gid_t *gids;
        char *qualified_name = NULL;
        TALLOC_CTX *mem_ctx = NULL;
-       DOM_SID u_sid;
+       struct dom_sid u_sid;
        enum lsa_SidType type;
-       auth_serversupplied_info *result;
-       
-       if ( !(sampass = samu_new( NULL )) ) {
-               return NT_STATUS_NO_MEMORY;
-       }
-       
-       status = samu_set_unix( sampass, pwd );
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
-       }
-
-       result = make_server_info(NULL);
-       if (result == NULL) {
-               TALLOC_FREE(sampass);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       result->sam_account = sampass;
-       result->unix_name = talloc_strdup(result, unix_username);
-       result->uid = pwd->pw_uid;
-       result->gid = pwd->pw_gid;
-
-       status = pdb_enum_group_memberships(result, sampass,
-                                           &result->sids, &gids,
-                                           &result->num_sids);
-
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(10, ("pdb_enum_group_memberships failed: %s\n",
-                          nt_errstr(status)));
-               TALLOC_FREE(result);
-               return status;
-       }
+       struct auth_serversupplied_info *result;
 
        /*
         * The SID returned in server_info->sam_account is based
@@ -1048,7 +695,6 @@ NTSTATUS make_server_info_pw(auth_serversupplied_info **server_info,
 
        mem_ctx = talloc_init("make_server_info_pw_tmp");
        if (!mem_ctx) {
-               TALLOC_FREE(result);
                return NT_STATUS_NO_MEMORY;
        }
 
@@ -1056,7 +702,6 @@ NTSTATUS make_server_info_pw(auth_serversupplied_info **server_info,
                                        unix_users_domain_name(),
                                        unix_username );
        if (!qualified_name) {
-               TALLOC_FREE(result);
                TALLOC_FREE(mem_ctx);
                return NT_STATUS_NO_MEMORY;
        }
@@ -1064,7 +709,6 @@ NTSTATUS make_server_info_pw(auth_serversupplied_info **server_info,
        if (!lookup_name(mem_ctx, qualified_name, LOOKUP_NAME_ALL,
                                                NULL, NULL,
                                                &u_sid, &type)) {
-               TALLOC_FREE(result);
                TALLOC_FREE(mem_ctx);
                return NT_STATUS_NO_SUCH_USER;
        }
@@ -1072,140 +716,365 @@ NTSTATUS make_server_info_pw(auth_serversupplied_info **server_info,
        TALLOC_FREE(mem_ctx);
 
        if (type != SID_NAME_USER) {
-               TALLOC_FREE(result);
                return NT_STATUS_NO_SUCH_USER;
        }
 
-       status = add_sid_to_array_unique(result, &u_sid,
-                                        &result->sids,
-                                        &result->num_sids);
+       if ( !(sampass = samu_new( NULL )) ) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       status = samu_set_unix( sampass, pwd );
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       /* In pathological cases the above call can set the account
+        * name to the DOMAIN\username form. Reset the account name
+        * using unix_username */
+       pdb_set_username(sampass, unix_username, PDB_SET);
+
+       /* set the user sid to be the calculated u_sid */
+       pdb_set_user_sid(sampass, &u_sid, PDB_SET);
+
+       result = make_server_info(NULL);
+       if (result == NULL) {
+               TALLOC_FREE(sampass);
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       status = samu_to_SamInfo3(result, sampass, lp_netbios_name(),
+                                 &result->info3, &result->extra);
+       TALLOC_FREE(sampass);
        if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(10, ("Failed to convert samu to info3: %s\n",
+                          nt_errstr(status)));
                TALLOC_FREE(result);
                return status;
        }
 
-       /* For now we throw away the gids and convert via sid_to_gid
-        * later. This needs fixing, but I'd like to get the code straight and
-        * simple first. */
-       TALLOC_FREE(gids);
+       result->unix_name = talloc_strdup(result, unix_username);
+
+       if (result->unix_name == NULL) {
+               TALLOC_FREE(result);
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       result->utok.uid = pwd->pw_uid;
+       result->utok.gid = pwd->pw_gid;
 
        *server_info = result;
 
        return NT_STATUS_OK;
 }
 
+static NTSTATUS get_guest_info3(TALLOC_CTX *mem_ctx,
+                               struct netr_SamInfo3 *info3)
+{
+       const char *guest_account = lp_guestaccount();
+       struct dom_sid domain_sid;
+       struct passwd *pwd;
+       const char *tmp;
+
+       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 account name */
+       tmp = talloc_strdup(mem_ctx, pwd->pw_name);
+       if (tmp == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       init_lsa_String(&info3->base.account_name, tmp);
+
+       /* Set domain name */
+       tmp = talloc_strdup(mem_ctx, get_global_sam_name());
+       if (tmp == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       init_lsa_StringLarge(&info3->base.domain, tmp);
+
+       /* Domain sid */
+       sid_copy(&domain_sid, get_global_sam_sid());
+
+       info3->base.domain_sid = dom_sid_dup(mem_ctx, &domain_sid);
+       if (info3->base.domain_sid == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       /* Guest rid */
+       info3->base.rid = DOMAIN_RID_GUEST;
+
+       /* Primary gid */
+       info3->base.primary_gid = BUILTIN_RID_GUESTS;
+
+       /* Set as guest */
+       info3->base.user_flags = NETLOGON_GUEST;
+
+       TALLOC_FREE(pwd);
+       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(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 = lp_netbios_name();
+       struct netr_SamInfo3 info3;
+       TALLOC_CTX *tmp_ctx;
        NTSTATUS status;
-       struct samu *sampass = NULL;
-       DOM_SID guest_sid;
-       bool ret;
-       char zeros[16];
-       fstring tmp;
 
-       if ( !(sampass = samu_new( NULL )) ) {
+       tmp_ctx = talloc_stackframe();
+       if (tmp_ctx == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       sid_copy(&guest_sid, get_global_sam_sid());
-       sid_append_rid(&guest_sid, DOMAIN_USER_RID_GUEST);
+       ZERO_STRUCT(info3);
 
-       become_root();
-       ret = pdb_getsampwsid(sampass, &guest_sid);
-       unbecome_root();
+       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;
+       }
 
-       if (!ret) {
-               TALLOC_FREE(sampass);
+       status = make_server_info_info3(tmp_ctx,
+                                       guest_account,
+                                       domain,
+                                       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;
+
+       /* 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,
+                                   (*server_info)->info3->base.account_name.string,
+                                   session_info);
+       if (!NT_STATUS_IS_OK(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));
+
+       status = NT_STATUS_OK;
+done:
+       TALLOC_FREE(tmp_ctx);
+       return status;
+}
+
+/***************************************************************************
+ Make (and fill) a auth_session_info struct for a system user login.
+ This *must* succeed for smbd to start.
+***************************************************************************/
+
+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_SUCH_USER;
        }
 
-       status = make_server_info_sam(server_info, sampass);
+       status = make_session_info_from_username(mem_ctx,
+                                                pwd->pw_name,
+                                                false,
+                                                session_info);
+       TALLOC_FREE(pwd);
        if (!NT_STATUS_IS_OK(status)) {
-               TALLOC_FREE(sampass);
                return status;
        }
-       
-       (*server_info)->guest = True;
 
-       status = create_local_token(*server_info);
+       (*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)) {
-               DEBUG(10, ("create_local_token failed: %s\n",
-                          nt_errstr(status)));
+               TALLOC_FREE((*session_info));
                return status;
        }
 
-       /* annoying, but the Guest really does have a session key, and it is
-          all zeros! */
-       ZERO_STRUCT(zeros);
-       (*server_info)->user_session_key = data_blob(zeros, sizeof(zeros));
-       (*server_info)->lm_session_key = data_blob(zeros, sizeof(zeros));
+       return NT_STATUS_OK;
+}
 
-       alpha_strcpy(tmp, pdb_get_username(sampass), ". _-$", sizeof(tmp));
-       (*server_info)->sanitized_username = talloc_strdup(*server_info, tmp);
+/****************************************************************************
+  Fake a auth_session_info just from a username (as a
+  session_info structure, with create_local_token() already called on
+  it.
+****************************************************************************/
 
-       return NT_STATUS_OK;
+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 = Get_Pwnam_alloc(talloc_tos(), username);
+       if (pwd == NULL) {
+               return NT_STATUS_NO_SUCH_USER;
+       }
+
+       status = make_server_info_pw(&result, pwd->pw_name, pwd);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               TALLOC_FREE(pwd);
+               return status;
+       }
+
+       result->nss_token = true;
+       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, pwd->pw_name, session_info);
+       TALLOC_FREE(pwd);
+       talloc_free(result);
+       return status;
 }
 
-static auth_serversupplied_info *copy_serverinfo(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)
 {
-       auth_serversupplied_info *dst;
+       struct auth_serversupplied_info *dst;
 
-       dst = make_server_info(NULL);
+       dst = make_server_info(mem_ctx);
        if (dst == NULL) {
                return NULL;
        }
 
-       dst->guest = src->guest;
-       dst->uid = src->uid;
-       dst->gid = src->gid;
-       dst->n_groups = src->n_groups;
-       if (src->n_groups != 0) {
-               dst->groups = (gid_t *)TALLOC_MEMDUP(
-                       dst, src->groups, sizeof(gid_t)*dst->n_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->groups = NULL;
-       }
-
-       if (src->ptok) {
-               dst->ptok = dup_nt_token(dst, src->ptok);
-               if (!dst->ptok) {
-                       TALLOC_FREE(dst);
-                       return NULL;
-               }
+               dst->utok.groups = NULL;
        }
-       
-       dst->user_session_key = data_blob_talloc( dst, src->user_session_key.data,
-                                               src->user_session_key.length);
 
-       dst->lm_session_key = data_blob_talloc(dst, src->lm_session_key.data,
-                                               src->lm_session_key.length);
+       /* 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->sam_account = samu_new(NULL);
-       if (!dst->sam_account) {
+       dst->security_token = dup_nt_token(dst, src->security_token);
+       if (!dst->security_token) {
                TALLOC_FREE(dst);
                return NULL;
        }
 
-       if (!pdb_copy_sam_account(dst->sam_account, src->sam_account)) {
+       dst->session_key = data_blob_talloc( dst, src->session_key.data,
+                                               src->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, server_info->info3);
+       if (!dst->info3) {
                TALLOC_FREE(dst);
                return NULL;
        }
-       
-       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);
-       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;
        }
@@ -1213,37 +1082,90 @@ static auth_serversupplied_info *copy_serverinfo(auth_serversupplied_info *src)
        return dst;
 }
 
-static auth_serversupplied_info *guest_info = NULL;
+/*
+ * Set a new session key. Used in the rpc server where we have to override the
+ * SMB level session key with SystemLibraryDTC
+ */
+
+bool session_info_set_session_key(struct auth_session_info *info,
+                                DATA_BLOB session_key)
+{
+       TALLOC_FREE(info->session_key.data);
+
+       info->session_key = data_blob_talloc(
+               info, session_key.data, session_key.length);
+
+       return (info->session_key.data != 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(auth_serversupplied_info **server_info)
+NTSTATUS make_server_info_guest(TALLOC_CTX *mem_ctx,
+                               struct auth_serversupplied_info **server_info)
 {
-       *server_info = copy_serverinfo(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;
 }
 
+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)
+{
+       if (system_info != NULL)
+               return NT_STATUS_OK;
+
+       return make_new_session_info_system(NULL, &system_info);
+}
+
+NTSTATUS make_session_info_system(TALLOC_CTX *mem_ctx,
+                               struct auth_session_info **session_info)
+{
+       if (system_info == NULL) return NT_STATUS_UNSUCCESSFUL;
+       *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;
@@ -1253,57 +1175,68 @@ 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;
 }
 
 /***************************************************************************
  Purely internal function for make_server_info_info3
- Fill the sam account from getpwnam
 ***************************************************************************/
-static NTSTATUS fill_sam_account(TALLOC_CTX *mem_ctx, 
-                                const char *domain,
-                                const char *username,
-                                char **found_username,
-                                uid_t *uid, gid_t *gid,
-                                struct samu *account,
-                                bool *username_was_mapped)
+
+static NTSTATUS check_account(TALLOC_CTX *mem_ctx, const char *domain,
+                             const char *username, char **found_username,
+                             struct passwd **pwd,
+                             bool *username_was_mapped)
 {
-       NTSTATUS nt_status;
-       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 is necessary. */
+       /* 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;
+       }
 
-       if ( !(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;
+       }
 
-       *uid = passwd->pw_uid;
-       *gid = passwd->pw_gid;
+       *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?   
                                         --jerry              */
-          
+
        *found_username = talloc_strdup( mem_ctx, real_username );
-       
-       DEBUG(5,("fill_sam_account: located username was [%s]\n", *found_username));
-
-       nt_status = samu_set_unix( account, passwd );
-       
-       TALLOC_FREE(passwd);
-       
-       return nt_status;
+
+       return NT_STATUS_OK;
 }
 
 /****************************************************************************
@@ -1311,49 +1244,57 @@ static NTSTATUS fill_sam_account(TALLOC_CTX *mem_ctx,
  try again in case a local UNIX user is already there.  Also run through 
  the username if we fallback to the username only.
  ****************************************************************************/
-struct passwd *smb_getpwnam( TALLOC_CTX *mem_ctx, char *domuser,
-                            fstring save_username, bool create )
+
+struct passwd *smb_getpwnam( TALLOC_CTX *mem_ctx, const char *domuser,
+                            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 mutliple times */
+          up the stack so we don't call it multiple times */
+
+       username = talloc_strdup(mem_ctx, domuser);
+       if (!username) {
+               return NULL;
+       }
 
-       fstrcpy( username, domuser );
-       
        p = strchr_m( username, *lp_winbind_separator() );
-       
+
        /* code for a DOMAIN\user string */
-       
-       if ( p ) {
-               fstring strip_username;
 
+       if ( p ) {
                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' */
 
                        if ( !strchr_m( pw->pw_name, *lp_winbind_separator() ) ) {
                                char *domain;
-                               
+
                                /* split the domain and username into 2 strings */
                                *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;
                }
 
@@ -1361,33 +1302,35 @@ struct passwd *smb_getpwnam( TALLOC_CTX *mem_ctx, 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 */
-       
+
        pw = Get_Pwnam_alloc(mem_ctx, username);
-               
+
        /* Create local user if requested but only if winbindd
           is not running.  We need to protect against cases
           where winbindd is failing and then prematurely
           creating users in /etc/passwd */
-       
+
        if ( !pw && create && !winbind_ping() ) {
                /* Don't add a machine account. */
                if (username[strlen(username)-1] == '$')
                        return NULL;
 
-               smb_create_user(NULL, username, NULL);
+               _smb_create_user(NULL, username, NULL);
                pw = Get_Pwnam_alloc(mem_ctx, username);
        }
-       
+
        /* 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;
 }
 
@@ -1398,24 +1341,20 @@ struct passwd *smb_getpwnam( TALLOC_CTX *mem_ctx, char *domuser,
 NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx, 
                                const char *sent_nt_username,
                                const char *domain,
-                               auth_serversupplied_info **server_info, 
+                               struct auth_serversupplied_info **server_info,
                                struct netr_SamInfo3 *info3)
 {
-       char zeros[16];
+       static const char zeros[16] = {0, };
 
        NTSTATUS nt_status = NT_STATUS_OK;
        char *found_username = NULL;
        const char *nt_domain;
        const char *nt_username;
-       struct samu *sam_account = NULL;
-       DOM_SID user_sid;
-       DOM_SID group_sid;
        bool username_was_mapped;
-
-       uid_t uid = (uid_t)-1;
-       gid_t gid = (gid_t)-1;
-
-       auth_serversupplied_info *result;
+       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
@@ -1423,16 +1362,6 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
           matches.
        */
 
-       sid_copy(&user_sid, info3->base.domain_sid);
-       if (!sid_append_rid(&user_sid, info3->base.rid)) {
-               return NT_STATUS_INVALID_PARAMETER;
-       }
-       
-       sid_copy(&group_sid, info3->base.domain_sid);
-       if (!sid_append_rid(&group_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
@@ -1446,9 +1375,8 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
                 * them */
                nt_domain = domain;
        }
-       
-       /* try to fill the SAM account..  If getpwnam() fails, then try the 
-          add user script (2.2.x behavior).
+
+       /* If getpwnam() fails try the add user script (2.2.x behavior).
 
           We use the _unmapped_ username here in an attempt to provide
           consistent username mapping behavior between kerberos and NTLM[SSP]
@@ -1458,162 +1386,69 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
           called map_username() unnecessarily in make_user_info_map() but
           that is how the current code is designed.  Making the change here
           is the least disruptive place.  -- jerry */
-          
-       if ( !(sam_account = samu_new( NULL )) ) {
-               return NT_STATUS_NO_MEMORY;
-       }
 
        /* this call will try to create the user if necessary */
 
-       nt_status = fill_sam_account(mem_ctx, nt_domain, sent_nt_username,
-                                    &found_username, &uid, &gid, sam_account,
+       nt_status = check_account(mem_ctx, nt_domain, sent_nt_username,
+                                    &found_username, &pwd,
                                     &username_was_mapped);
 
-       
-       /* if we still don't have a valid unix account check for 
-         'map to guest = bad uid' */
-         
        if (!NT_STATUS_IS_OK(nt_status)) {
-               TALLOC_FREE( sam_account );
-               if ( lp_map_to_guest() == MAP_TO_GUEST_ON_BAD_UID ) {
-                       make_server_info_guest(server_info); 
-                       return NT_STATUS_OK;
-               }
                return nt_status;
        }
-               
-       if (!pdb_set_nt_username(sam_account, nt_username, PDB_CHANGED)) {
-               TALLOC_FREE(sam_account);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       if (!pdb_set_username(sam_account, nt_username, PDB_CHANGED)) {
-               TALLOC_FREE(sam_account);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       if (!pdb_set_domain(sam_account, nt_domain, PDB_CHANGED)) {
-               TALLOC_FREE(sam_account);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       if (!pdb_set_user_sid(sam_account, &user_sid, PDB_CHANGED)) {
-               TALLOC_FREE(sam_account);
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
-       if (!pdb_set_group_sid(sam_account, &group_sid, PDB_CHANGED)) {
-               TALLOC_FREE(sam_account);
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
-       if (!pdb_set_fullname(sam_account,
-                             info3->base.full_name.string,
-                             PDB_CHANGED)) {
-               TALLOC_FREE(sam_account);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       if (!pdb_set_logon_script(sam_account,
-                                 info3->base.logon_script.string,
-                                 PDB_CHANGED)) {
-               TALLOC_FREE(sam_account);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       if (!pdb_set_profile_path(sam_account,
-                                 info3->base.profile_path.string,
-                                 PDB_CHANGED)) {
-               TALLOC_FREE(sam_account);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       if (!pdb_set_homedir(sam_account,
-                            info3->base.home_directory.string,
-                            PDB_CHANGED)) {
-               TALLOC_FREE(sam_account);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       if (!pdb_set_dir_drive(sam_account,
-                              info3->base.home_drive.string,
-                              PDB_CHANGED)) {
-               TALLOC_FREE(sam_account);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       if (!pdb_set_acct_ctrl(sam_account, info3->base.acct_flags, PDB_CHANGED)) {
-               TALLOC_FREE(sam_account);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       if (!pdb_set_pass_last_set_time(
-                   sam_account,
-                   nt_time_to_unix(info3->base.last_password_change),
-                   PDB_CHANGED)) {
-               TALLOC_FREE(sam_account);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       if (!pdb_set_pass_can_change_time(
-                   sam_account,
-                   nt_time_to_unix(info3->base.allow_password_change),
-                   PDB_CHANGED)) {
-               TALLOC_FREE(sam_account);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       if (!pdb_set_pass_must_change_time(
-                   sam_account,
-                   nt_time_to_unix(info3->base.force_password_change),
-                   PDB_CHANGED)) {
-               TALLOC_FREE(sam_account);
-               return NT_STATUS_NO_MEMORY;
-       }
 
        result = make_server_info(NULL);
        if (result == NULL) {
                DEBUG(4, ("make_server_info failed!\n"));
-               TALLOC_FREE(sam_account);
                return NT_STATUS_NO_MEMORY;
        }
 
-       /* save this here to _net_sam_logon() doesn't fail (it assumes a 
-          valid struct samu) */
-                  
-       result->sam_account = sam_account;
        result->unix_name = talloc_strdup(result, found_username);
 
-       /* Fill in the unix info we found on the way */
-
-       result->uid = uid;
-       result->gid = gid;
-
-       /* Create a 'combined' list of all SIDs we might want in the SD */
-
-       result->num_sids = 0;
-       result->sids = NULL;
+       /* copy in the info3 */
+       result->info3 = i3 = copy_netr_SamInfo3(result, info3);
+       if (result->info3 == NULL) {
+               TALLOC_FREE(result);
+               return NT_STATUS_NO_MEMORY;
+       }
 
-       nt_status = sid_array_from_info3(result, info3,
-                                        &result->sids,
-                                        &result->num_sids,
-                                        false, false);
+       /* 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 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);
        if (!NT_STATUS_IS_OK(nt_status)) {
                TALLOC_FREE(result);
                return nt_status;
        }
 
-       result->login_server = talloc_strdup(result,
-                                            info3->base.logon_server.string);
+       /* 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 */
 
-       ZERO_STRUCT(zeros);
-
        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));
        }
@@ -1628,6 +1463,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;
@@ -1641,301 +1478,45 @@ NTSTATUS make_server_info_wbcAuthUserInfo(TALLOC_CTX *mem_ctx,
                                          const char *sent_nt_username,
                                          const char *domain,
                                          const struct wbcAuthUserInfo *info,
-                                         auth_serversupplied_info **server_info)
+                                         struct auth_serversupplied_info **server_info)
 {
-       char zeros[16];
-
-       NTSTATUS nt_status = NT_STATUS_OK;
-       char *found_username = NULL;
-       const char *nt_domain;
-       const char *nt_username;
-       struct samu *sam_account = NULL;
-       DOM_SID user_sid;
-       DOM_SID group_sid;
-       bool username_was_mapped;
-       uint32_t i;
-
-       uid_t uid = (uid_t)-1;
-       gid_t gid = (gid_t)-1;
-
-       auth_serversupplied_info *result;
-
-       result = make_server_info(NULL);
-       if (result == NULL) {
-               DEBUG(4, ("make_server_info failed!\n"));
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       /*
-          Here is where we should check the list of
-          trusted domains, and verify that the SID
-          matches.
-       */
-
-       memcpy(&user_sid, &info->sids[0].sid, sizeof(user_sid));
-       memcpy(&group_sid, &info->sids[1].sid, sizeof(group_sid));
-
-       if (info->account_name) {
-               nt_username = talloc_strdup(result, info->account_name);
-       } else {
-               /* If the server didn't give us one, just use the one we sent
-                * them */
-               nt_username = talloc_strdup(result, sent_nt_username);
-       }
-       if (!nt_username) {
-               TALLOC_FREE(result);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       if (info->domain_name) {
-               nt_domain = talloc_strdup(result, info->domain_name);
-       } else {
-               /* If the server didn't give us one, just use the one we sent
-                * them */
-               nt_domain = talloc_strdup(result, domain);
-       }
-       if (!nt_domain) {
-               TALLOC_FREE(result);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       /* try to fill the SAM account..  If getpwnam() fails, then try the
-          add user script (2.2.x behavior).
-
-          We use the _unmapped_ username here in an attempt to provide
-          consistent username mapping behavior between kerberos and NTLM[SSP]
-          authentication in domain mode security.  I.E. Username mapping
-          should be applied to the fully qualified username
-          (e.g. DOMAIN\user) and not just the login name.  Yes this means we
-          called map_username() unnecessarily in make_user_info_map() but
-          that is how the current code is designed.  Making the change here
-          is the least disruptive place.  -- jerry */
-
-       if ( !(sam_account = samu_new( result )) ) {
-               TALLOC_FREE(result);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       /* this call will try to create the user if necessary */
-
-       nt_status = fill_sam_account(result, nt_domain, sent_nt_username,
-                                    &found_username, &uid, &gid, sam_account,
-                                    &username_was_mapped);
-
-       /* if we still don't have a valid unix account check for
-         'map to guest = bad uid' */
-
-       if (!NT_STATUS_IS_OK(nt_status)) {
-               TALLOC_FREE( result );
-               if ( lp_map_to_guest() == MAP_TO_GUEST_ON_BAD_UID ) {
-                       make_server_info_guest(server_info);
-                       return NT_STATUS_OK;
-               }
-               return nt_status;
-       }
-
-       if (!pdb_set_nt_username(sam_account, nt_username, PDB_CHANGED)) {
-               TALLOC_FREE(result);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       if (!pdb_set_username(sam_account, nt_username, PDB_CHANGED)) {
-               TALLOC_FREE(result);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       if (!pdb_set_domain(sam_account, nt_domain, PDB_CHANGED)) {
-               TALLOC_FREE(result);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       if (!pdb_set_user_sid(sam_account, &user_sid, PDB_CHANGED)) {
-               TALLOC_FREE(result);
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
-       if (!pdb_set_group_sid(sam_account, &group_sid, PDB_CHANGED)) {
-               TALLOC_FREE(result);
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
-       if (!pdb_set_fullname(sam_account, info->full_name, PDB_CHANGED)) {
-               TALLOC_FREE(result);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       if (!pdb_set_logon_script(sam_account, info->logon_script, PDB_CHANGED)) {
-               TALLOC_FREE(result);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       if (!pdb_set_profile_path(sam_account, info->profile_path, PDB_CHANGED)) {
-               TALLOC_FREE(result);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       if (!pdb_set_homedir(sam_account, info->home_directory, PDB_CHANGED)) {
-               TALLOC_FREE(result);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       if (!pdb_set_dir_drive(sam_account, info->home_drive, PDB_CHANGED)) {
-               TALLOC_FREE(result);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       if (!pdb_set_acct_ctrl(sam_account, info->acct_flags, PDB_CHANGED)) {
-               TALLOC_FREE(result);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       if (!pdb_set_pass_last_set_time(
-                   sam_account,
-                   nt_time_to_unix(info->pass_last_set_time),
-                   PDB_CHANGED)) {
-               TALLOC_FREE(result);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       if (!pdb_set_pass_can_change_time(
-                   sam_account,
-                   nt_time_to_unix(info->pass_can_change_time),
-                   PDB_CHANGED)) {
-               TALLOC_FREE(result);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       if (!pdb_set_pass_must_change_time(
-                   sam_account,
-                   nt_time_to_unix(info->pass_must_change_time),
-                   PDB_CHANGED)) {
-               TALLOC_FREE(result);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       /* save this here to _net_sam_logon() doesn't fail (it assumes a
-          valid struct samu) */
-
-       result->sam_account = sam_account;
-       result->unix_name = talloc_strdup(result, found_username);
-
-       result->login_server = talloc_strdup(result, info->logon_server);
+       struct netr_SamInfo3 *info3;
 
-       /* Fill in the unix info we found on the way */
-
-       result->uid = uid;
-       result->gid = gid;
-
-       /* Create a 'combined' list of all SIDs we might want in the SD */
-
-       result->num_sids = info->num_sids - 2;
-       result->sids = talloc_array(result, DOM_SID, result->num_sids);
-       if (result->sids == NULL) {
-               TALLOC_FREE(result);
+       info3 = wbcAuthUserInfo_to_netr_SamInfo3(mem_ctx, info);
+       if (!info3) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       for (i=0; i < result->num_sids; i++) {
-               memcpy(&result->sids[i], &info->sids[i+2].sid, sizeof(result->sids[i]));
-       }
-
-       /* ensure we are never given NULL session keys */
-
-       ZERO_STRUCT(zeros);
-
-       if (memcmp(info->user_session_key, zeros, sizeof(zeros)) == 0) {
-               result->user_session_key = data_blob_null;
-       } else {
-               result->user_session_key = data_blob_talloc(
-                       result, info->user_session_key,
-                       sizeof(info->user_session_key));
-       }
-
-       if (memcmp(info->lm_session_key, zeros, 8) == 0) {
-               result->lm_session_key = data_blob_null;
-       } else {
-               result->lm_session_key = data_blob_talloc(
-                       result, info->lm_session_key,
-                       sizeof(info->lm_session_key));
-       }
-
-       result->nss_token |= username_was_mapped;
-
-       *server_info = result;
-
-       return NT_STATUS_OK;
-}
-
-/***************************************************************************
- Free a user_info struct
-***************************************************************************/
-
-void free_user_info(auth_usersupplied_info **user_info)
-{
-       DEBUG(5,("attempting to free (and zero) a user_info structure\n"));
-       if (*user_info != NULL) {
-               if ((*user_info)->smb_name) {
-                       DEBUG(10,("structure was created for %s\n",
-                                 (*user_info)->smb_name));
-               }
-               SAFE_FREE((*user_info)->smb_name);
-               SAFE_FREE((*user_info)->internal_username);
-               SAFE_FREE((*user_info)->client_domain);
-               SAFE_FREE((*user_info)->domain);
-               SAFE_FREE((*user_info)->wksta_name);
-               data_blob_free(&(*user_info)->lm_resp);
-               data_blob_free(&(*user_info)->nt_resp);
-               data_blob_clear_free(&(*user_info)->lm_interactive_pwd);
-               data_blob_clear_free(&(*user_info)->nt_interactive_pwd);
-               data_blob_clear_free(&(*user_info)->plaintext_password);
-               ZERO_STRUCT(**user_info);
-       }
-       SAFE_FREE(*user_info);
-}
-
-/***************************************************************************
- Make an auth_methods struct
-***************************************************************************/
-
-bool make_auth_methods(struct auth_context *auth_context, auth_methods **auth_method) 
-{
-       if (!auth_context) {
-               smb_panic("no auth_context supplied to "
-                         "make_auth_methods()!\n");
-       }
-
-       if (!auth_method) {
-               smb_panic("make_auth_methods: pointer to auth_method pointer "
-                         "is NULL!\n");
-       }
-
-       *auth_method = TALLOC_P(auth_context->mem_ctx, auth_methods);
-       if (!*auth_method) {
-               DEBUG(0,("make_auth_method: malloc failed!\n"));
-               return False;
-       }
-       ZERO_STRUCTP(*auth_method);
-       
-       return True;
+       return make_server_info_info3(mem_ctx,
+                                     sent_nt_username, domain,
+                                     server_info, info3);
 }
 
 /**
  * Verify whether or not given domain is trusted.
  *
  * @param domain_name name of the domain to be verified
- * @return true if domain is one of the trusted once or
+ * @return true if domain is one of the trusted ones or
  *         false if otherwise
  **/
 
 bool is_trusted_domain(const char* dom_name)
 {
-       DOM_SID trustdom_sid;
+       struct dom_sid trustdom_sid;
        bool ret;
 
        /* 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;
+       }
+
+       if (strequal(dom_name, get_global_sam_name())) {
+               return false;
+       }
 
        /* if we are a DC, then check for a direct trust relationships */
 
@@ -1946,7 +1527,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;
@@ -1956,18 +1537,18 @@ 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
                   and running. We need to update the trustdom_cache
                   ourselves */
-               
+
                update_trustdom_cache();
        }
 
@@ -1976,9 +1557,39 @@ 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);
+               }
+       } 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));
+                       status = make_server_info_guest(NULL, server_info);
+               }
+       }
+
+       return status;
+}