r16749: BUG 3905: don't fail in create_local_nt_token() when a
[ira/wip.git] / source / auth / auth_util.c
index 71634f08ed84666af4c5dfe367837064a060131c..df4a4e1b3887b9935effae57130a540a78b1dc4f 100644 (file)
@@ -5,6 +5,7 @@
    Copyright (C) Andrew Bartlett 2001
    Copyright (C) Jeremy Allison 2000-2001
    Copyright (C) Rafal Szczesniak 2002
+   Copyright (C) Volker Lendecke 2006
 
    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
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH
 
-extern DOM_SID global_sid_World;
-extern DOM_SID global_sid_Network;
-extern DOM_SID global_sid_Builtin_Guests;
-extern DOM_SID global_sid_Authenticated_Users;
-
+static struct nt_user_token *create_local_nt_token(TALLOC_CTX *mem_ctx,
+                                                  const DOM_SID *user_sid,
+                                                  const DOM_SID *group_sid,
+                                                  BOOL is_guest,
+                                                  int num_groupsids,
+                                                  const DOM_SID *groupsids);
 
 /****************************************************************************
  Create a UNIX user on demand.
@@ -50,70 +52,11 @@ static int smb_create_user(const char *domain, const char *unix_username, const
        if (homedir)
                all_string_sub(add_script, "%H", homedir, sizeof(pstring));
        ret = smbrun(add_script,NULL);
-       DEBUG(3,("smb_create_user: Running the command `%s' gave %d\n",add_script,ret));
+       flush_pwnam_cache();
+       DEBUG(ret ? 0 : 3,("smb_create_user: Running the command `%s' gave %d\n",add_script,ret));
        return ret;
 }
 
-/****************************************************************************
- Add and Delete UNIX users on demand, based on NTSTATUS codes.
- We don't care about RID's here so ignore.
-****************************************************************************/
-
-void auth_add_user_script(const char *domain, const char *username)
-{
-       uint32 rid;
-       /*
-        * User validated ok against Domain controller.
-        * If the admin wants us to try and create a UNIX
-        * user on the fly, do so.
-        */
-       
-       if ( *lp_adduser_script() )
-               smb_create_user(domain, username, NULL);
-       else {
-               DEBUG(10,("auth_add_user_script: no 'add user script'.  Asking winbindd\n"));
-               
-               /* should never get here is we a re a domain member running winbindd
-                  However, a host set for 'security = server' might run winbindd for 
-                  account allocation */
-                  
-               if ( !winbind_create_user(username, NULL) ) {
-                       DEBUG(5,("auth_add_user_script: winbindd_create_user() failed\n"));
-                       rid = 0;
-               }
-       }
-}
-
-/****************************************************************************
- Create a SAM_ACCOUNT - either by looking in the pdb, or by faking it up from
- unix info.
-****************************************************************************/
-
-NTSTATUS auth_get_sam_account(const char *user, SAM_ACCOUNT **account) 
-{
-       BOOL pdb_ret;
-       NTSTATUS nt_status;
-       if (!NT_STATUS_IS_OK(nt_status = pdb_init_sam(account))) {
-               return nt_status;
-       }
-       
-       become_root();
-       pdb_ret = pdb_getsampwnam(*account, user);
-       unbecome_root();
-
-       if (!pdb_ret) {
-               
-               struct passwd *pass = Get_Pwnam(user);
-               if (!pass) 
-                       return NT_STATUS_NO_SUCH_USER;
-
-               if (!NT_STATUS_IS_OK(nt_status = pdb_fill_sam_pw(*account, pass))) {
-                       return nt_status;
-               }
-       }
-       return NT_STATUS_OK;
-}
-
 /****************************************************************************
  Create an auth_usersupplied_data structure
 ****************************************************************************/
@@ -124,15 +67,16 @@ static NTSTATUS make_user_info(auth_usersupplied_info **user_info,
                                const char *client_domain, 
                                const char *domain,
                                const char *wksta_name, 
-                               DATA_BLOB lm_pwd, DATA_BLOB nt_pwd,
-                               DATA_BLOB plaintext, 
-                               uint32 auth_flags, BOOL encrypted)
+                               DATA_BLOB *lm_pwd, DATA_BLOB *nt_pwd,
+                               DATA_BLOB *lm_interactive_pwd, DATA_BLOB *nt_interactive_pwd,
+                               DATA_BLOB *plaintext, 
+                               BOOL encrypted)
 {
 
        DEBUG(5,("attempting to make a user_info for %s (%s)\n", internal_username, smb_name));
 
-       *user_info = malloc(sizeof(**user_info));
-       if (!user_info) {
+       *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;
        }
@@ -141,54 +85,53 @@ static NTSTATUS make_user_info(auth_usersupplied_info **user_info,
 
        DEBUG(5,("making strings for %s's user_info struct\n", internal_username));
 
-       (*user_info)->smb_name.str = strdup(smb_name);
-       if ((*user_info)->smb_name.str) { 
-               (*user_info)->smb_name.len = strlen(smb_name);
-       } else {
+       (*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.str = strdup(internal_username);
-       if ((*user_info)->internal_username.str) { 
-               (*user_info)->internal_username.len = strlen(internal_username);
-       } else {
+       (*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.str = strdup(domain);
-       if ((*user_info)->domain.str) { 
-               (*user_info)->domain.len = strlen(domain);
-       } else {
+       (*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.str = strdup(client_domain);
-       if ((*user_info)->client_domain.str) { 
-               (*user_info)->client_domain.len = strlen(client_domain);
-       } else {
+       (*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.str = strdup(wksta_name);
-       if ((*user_info)->wksta_name.str) { 
-               (*user_info)->wksta_name.len = strlen(wksta_name);
-       } else {
+       (*user_info)->wksta_name = SMB_STRDUP(wksta_name);
+       if ((*user_info)->wksta_name == NULL) { 
                free_user_info(user_info);
                return NT_STATUS_NO_MEMORY;
        }
 
        DEBUG(5,("making blobs for %s's user_info struct\n", internal_username));
 
-       (*user_info)->lm_resp = data_blob(lm_pwd.data, lm_pwd.length);
-       (*user_info)->nt_resp = data_blob(nt_pwd.data, nt_pwd.length);
-       (*user_info)->plaintext_password = data_blob(plaintext.data, plaintext.length);
+       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)->auth_flags = auth_flags;
+
+       (*user_info)->logon_parameters = 0;
 
        DEBUG(10,("made an %sencrypted user_info for %s (%s)\n", encrypted ? "":"un" , internal_username, smb_name));
 
@@ -203,14 +146,17 @@ 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 plaintext, 
-                           uint32 ntlmssp_flags, BOOL encrypted)
+                           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);
-       map_username(internal_username); 
+       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));
@@ -228,13 +174,19 @@ NTSTATUS make_user_info_map(auth_usersupplied_info **user_info,
           and let the "passdb backend" handle unknown users. */
 
        if ( !is_trusted_domain(domain) && !strequal(domain, get_global_sam_name()) ) 
-               domain = get_default_sam_name();
+               domain = my_sam_name();
        
        /* we know that it is a trusted domain (and we are allowing them) or it is our domain */
        
-       return make_user_info(user_info, smb_name, internal_username, 
-               client_domain, domain, wksta_name, lm_pwd, nt_pwd,
-               plaintext, ntlmssp_flags, encrypted);
+       result = make_user_info(user_info, smb_name, internal_username, 
+                             client_domain, domain, wksta_name, 
+                             lm_pwd, nt_pwd,
+                             lm_interactive_pwd, nt_interactive_pwd,
+                             plaintext, encrypted);
+       if (NT_STATUS_IS_OK(result)) {
+               (*user_info)->was_mapped = was_mapped;
+       }
+       return result;
 }
 
 /****************************************************************************
@@ -246,33 +198,30 @@ BOOL make_user_info_netlogon_network(auth_usersupplied_info **user_info,
                                     const char *smb_name, 
                                     const char *client_domain, 
                                     const char *wksta_name, 
-                                    const uchar *lm_network_pwd, int lm_pwd_len,
-                                    const uchar *nt_network_pwd, int nt_pwd_len)
+                                    uint32 logon_parameters,
+                                    const uchar *lm_network_pwd,
+                                    int lm_pwd_len,
+                                    const uchar *nt_network_pwd,
+                                    int nt_pwd_len)
 {
        BOOL ret;
-       NTSTATUS nt_status;
+       NTSTATUS status;
        DATA_BLOB lm_blob = data_blob(lm_network_pwd, lm_pwd_len);
        DATA_BLOB nt_blob = data_blob(nt_network_pwd, nt_pwd_len);
-       DATA_BLOB plaintext_blob = data_blob(NULL, 0);
-       uint32 auth_flags = AUTH_FLAG_NONE;
 
-       if (lm_pwd_len)
-               auth_flags |= AUTH_FLAG_LM_RESP;
-       if (nt_pwd_len == 24) {
-               auth_flags |= AUTH_FLAG_NTLM_RESP; 
-       } else if (nt_pwd_len != 0) {
-               auth_flags |= AUTH_FLAG_NTLMv2_RESP; 
+       status = make_user_info_map(user_info,
+                                   smb_name, client_domain, 
+                                   wksta_name, 
+                                   lm_pwd_len ? &lm_blob : NULL, 
+                                   nt_pwd_len ? &nt_blob : NULL,
+                                   NULL, NULL, NULL,
+                                   True);
+
+       if (NT_STATUS_IS_OK(status)) {
+               (*user_info)->logon_parameters = logon_parameters;
        }
+       ret = NT_STATUS_IS_OK(status) ? True : False;
 
-       nt_status = make_user_info_map(user_info,
-                                     smb_name, client_domain, 
-                                  wksta_name, 
-                                     lm_blob, nt_blob,
-                                     plaintext_blob, 
-                                     auth_flags, True);
-       
-       ret = NT_STATUS_IS_OK(nt_status) ? True : False;
-               
        data_blob_free(&lm_blob);
        data_blob_free(&nt_blob);
        return ret;
@@ -287,6 +236,7 @@ BOOL make_user_info_netlogon_interactive(auth_usersupplied_info **user_info,
                                         const char *smb_name, 
                                         const char *client_domain, 
                                         const char *wksta_name, 
+                                        uint32 logon_parameters,
                                         const uchar chal[8], 
                                         const uchar lm_interactive_pwd[16], 
                                         const uchar nt_interactive_pwd[16], 
@@ -297,13 +247,15 @@ BOOL make_user_info_netlogon_interactive(auth_usersupplied_info **user_info,
        unsigned char local_lm_response[24];
        unsigned char local_nt_response[24];
        unsigned char key[16];
-       uint32 auth_flags = AUTH_FLAG_NONE;
        
        ZERO_STRUCT(key);
        memcpy(key, dc_sess_key, 8);
        
-       if (lm_interactive_pwd) memcpy(lm_pwd, lm_interactive_pwd, sizeof(lm_pwd));
-       if (nt_interactive_pwd) memcpy(nt_pwd, nt_interactive_pwd, sizeof(nt_pwd));
+       if (lm_interactive_pwd)
+               memcpy(lm_pwd, lm_interactive_pwd, sizeof(lm_pwd));
+
+       if (nt_interactive_pwd)
+               memcpy(nt_pwd, nt_interactive_pwd, sizeof(nt_pwd));
        
 #ifdef DEBUG_PASSWORD
        DEBUG(100,("key:"));
@@ -316,8 +268,11 @@ BOOL make_user_info_netlogon_interactive(auth_usersupplied_info **user_info,
        dump_data(100, nt_pwd, sizeof(nt_pwd));
 #endif
        
-       SamOEMhash((uchar *)lm_pwd, key, sizeof(lm_pwd));
-       SamOEMhash((uchar *)nt_pwd, key, sizeof(nt_pwd));
+       if (lm_interactive_pwd)
+               SamOEMhash((uchar *)lm_pwd, key, sizeof(lm_pwd));
+       
+       if (nt_interactive_pwd)
+               SamOEMhash((uchar *)nt_pwd, key, sizeof(nt_pwd));
        
 #ifdef DEBUG_PASSWORD
        DEBUG(100,("decrypt of lm owf password:"));
@@ -327,37 +282,60 @@ BOOL make_user_info_netlogon_interactive(auth_usersupplied_info **user_info,
        dump_data(100, nt_pwd, sizeof(nt_pwd));
 #endif
        
-       SMBOWFencrypt((const unsigned char *)lm_pwd, chal, local_lm_response);
-       SMBOWFencrypt((const unsigned char *)nt_pwd, chal, local_nt_response);
+       if (lm_interactive_pwd)
+               SMBOWFencrypt((const unsigned char *)lm_pwd, chal,
+                             local_lm_response);
+
+       if (nt_interactive_pwd)
+               SMBOWFencrypt((const unsigned char *)nt_pwd, chal,
+                             local_nt_response);
        
        /* Password info paranoia */
-       ZERO_STRUCT(lm_pwd);
-       ZERO_STRUCT(nt_pwd);
        ZERO_STRUCT(key);
 
        {
                BOOL ret;
                NTSTATUS nt_status;
-               DATA_BLOB local_lm_blob = data_blob(local_lm_response, sizeof(local_lm_response));
-               DATA_BLOB local_nt_blob = data_blob(local_nt_response, sizeof(local_nt_response));
-               DATA_BLOB plaintext_blob = data_blob(NULL, 0);
-
-               if (lm_interactive_pwd)
-                       auth_flags |= AUTH_FLAG_LM_RESP;
-               if (nt_interactive_pwd)
-                       auth_flags |= AUTH_FLAG_NTLM_RESP; 
-
-               nt_status = make_user_info_map(user_info, 
-                                              smb_name, client_domain, 
-                                              wksta_name, 
-                                              local_lm_blob,
-                                              local_nt_blob,
-                                              plaintext_blob, 
-                                              auth_flags, True);
+               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, 
+                       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);
+
+               if (NT_STATUS_IS_OK(nt_status)) {
+                       (*user_info)->logon_parameters = logon_parameters;
+               }
+
                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;
        }
 }
@@ -377,42 +355,45 @@ 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;
-       uint32 auth_flags = AUTH_FLAG_NONE;
                        
        /*
         * Not encrypted - do so.
         */
        
-       DEBUG(5,("make_user_info_for_reply: User passwords not in encrypted format.\n"));
+       DEBUG(5,("make_user_info_for_reply: User passwords not in encrypted "
+                "format.\n"));
        
        if (plaintext_password.data) {
                unsigned char local_lm_response[24];
                
 #ifdef DEBUG_PASSWORD
-               DEBUG(10,("Unencrypted password (len %d):\n",plaintext_password.length));
-               dump_data(100, plaintext_password.data, plaintext_password.length);
+               DEBUG(10,("Unencrypted password (len %d):\n",
+                         (int)plaintext_password.length));
+               dump_data(100, (const char *)plaintext_password.data,
+                         plaintext_password.length);
 #endif
 
-               SMBencrypt( (const char *)plaintext_password.data, (const uchar*)chal, local_lm_response);
+               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, 0); 
                
-               auth_flags = (AUTH_FLAG_PLAINTEXT | AUTH_FLAG_LM_RESP);
        } else {
                local_lm_blob = data_blob(NULL, 0); 
                local_nt_blob = data_blob(NULL, 0); 
        }
        
-       ret = make_user_info_map(user_info, smb_name,
-                                client_domain, 
-                                get_remote_machine_name(),
-                                local_lm_blob,
-                                local_nt_blob,
-                                plaintext_password, 
-                                auth_flags, False);
+       ret = make_user_info_map(
+               user_info, smb_name, client_domain, 
+               get_remote_machine_name(),
+               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);
        
        data_blob_free(&local_lm_blob);
        return NT_STATUS_IS_OK(ret) ? True : False;
@@ -427,27 +408,13 @@ NTSTATUS make_user_info_for_reply_enc(auth_usersupplied_info **user_info,
                                       const char *client_domain, 
                                       DATA_BLOB lm_resp, DATA_BLOB nt_resp)
 {
-       uint32 auth_flags = AUTH_FLAG_NONE;
-
-       DATA_BLOB no_plaintext_blob = data_blob(NULL, 0); 
-       
-       if (lm_resp.length == 24) {
-               auth_flags |= AUTH_FLAG_LM_RESP;
-       }
-       if (nt_resp.length == 0) {
-       } else if (nt_resp.length == 24) {
-               auth_flags |= AUTH_FLAG_NTLM_RESP;
-       } else {
-               auth_flags |= AUTH_FLAG_NTLMv2_RESP;
-       }
-
        return make_user_info_map(user_info, smb_name, 
-                                client_domain, 
-                                get_remote_machine_name(), 
-                                lm_resp
-                                nt_resp
-                                no_plaintext_blob, 
-                                auth_flags, True);
+                                 client_domain, 
+                                 get_remote_machine_name(), 
+                                 lm_resp.data ? &lm_resp : NULL
+                                 nt_resp.data ? &nt_resp : NULL
+                                 NULL, NULL, NULL,
+                                 True);
 }
 
 /****************************************************************************
@@ -456,19 +423,16 @@ NTSTATUS make_user_info_for_reply_enc(auth_usersupplied_info **user_info,
 
 BOOL make_user_info_guest(auth_usersupplied_info **user_info) 
 {
-       DATA_BLOB lm_blob = data_blob(NULL, 0);
-       DATA_BLOB nt_blob = data_blob(NULL, 0);
-       DATA_BLOB plaintext_blob = data_blob(NULL, 0);
-       uint32 auth_flags = AUTH_FLAG_NONE;
        NTSTATUS nt_status;
 
        nt_status = make_user_info(user_info, 
-                             "","", 
-                             "","", 
-                             "", 
-                             nt_blob, lm_blob,
-                             plaintext_blob, 
-                             auth_flags, True);
+                                  "","", 
+                                  "","", 
+                                  "", 
+                                  NULL, NULL, 
+                                  NULL, NULL, 
+                                  NULL,
+                                  True);
                              
        return NT_STATUS_IS_OK(nt_status) ? True : False;
 }
@@ -479,7 +443,6 @@ BOOL make_user_info_guest(auth_usersupplied_info **user_info)
 
 void debug_nt_user_token(int dbg_class, int dbg_lev, NT_USER_TOKEN *token)
 {
-       fstring sid_str;
        size_t     i;
        
        if (!token) {
@@ -487,423 +450,986 @@ void debug_nt_user_token(int dbg_class, int dbg_lev, NT_USER_TOKEN *token)
                return;
        }
        
-       DEBUGC(dbg_class, dbg_lev, ("NT user token of user %s\n",
-                                   sid_to_string(sid_str, &token->user_sids[0]) ));
-       DEBUGADDC(dbg_class, dbg_lev, ("contains %lu SIDs\n", (unsigned long)token->num_sids));
+       DEBUGC(dbg_class, dbg_lev,
+              ("NT user token of user %s\n",
+               sid_string_static(&token->user_sids[0]) ));
+       DEBUGADDC(dbg_class, dbg_lev,
+                 ("contains %lu SIDs\n", (unsigned long)token->num_sids));
        for (i = 0; i < token->num_sids; i++)
-               DEBUGADDC(dbg_class, dbg_lev, ("SID[%3lu]: %s\n", (unsigned long)i, 
-                                              sid_to_string(sid_str, &token->user_sids[i])));
+               DEBUGADDC(dbg_class, dbg_lev,
+                         ("SID[%3lu]: %s\n", (unsigned long)i, 
+                          sid_string_static(&token->user_sids[i])));
+
+       dump_se_priv( dbg_class, dbg_lev, &token->privileges );
 }
 
 /****************************************************************************
  prints a UNIX 'token' to debug output.
 ****************************************************************************/
 
-void debug_unix_user_token(int dbg_class, int dbg_lev, uid_t uid, gid_t gid, int n_groups, gid_t *groups)
+void debug_unix_user_token(int dbg_class, int dbg_lev, uid_t uid, gid_t gid,
+                          int n_groups, gid_t *groups)
 {
        int     i;
-       DEBUGC(dbg_class, dbg_lev, ("UNIX token of user %ld\n", (long int)uid));
+       DEBUGC(dbg_class, dbg_lev,
+              ("UNIX token of user %ld\n", (long int)uid));
 
-       DEBUGADDC(dbg_class, dbg_lev, ("Primary group is %ld and contains %i supplementary groups\n", (long int)gid, n_groups));
+       DEBUGADDC(dbg_class, dbg_lev,
+                 ("Primary group is %ld and contains %i supplementary "
+                  "groups\n", (long int)gid, n_groups));
        for (i = 0; i < n_groups; i++)
                DEBUGADDC(dbg_class, dbg_lev, ("Group[%3i]: %ld\n", i, 
                        (long int)groups[i]));
 }
 
-/****************************************************************************
- Create the SID list for this user.
-****************************************************************************/
+/******************************************************************************
+ Create a token for the root user to be used internally by smbd.
+ This is similar to running under the context of the LOCAL_SYSTEM account
+ in Windows.  This is a read-only token.  Do not modify it or free() it.
+ Create a copy if your need to change it.
+******************************************************************************/
 
-static NTSTATUS create_nt_user_token(const DOM_SID *user_sid, const DOM_SID *group_sid, 
-                                    int n_groupSIDs, DOM_SID *groupSIDs, 
-                                    BOOL is_guest, NT_USER_TOKEN **token)
+NT_USER_TOKEN *get_root_nt_token( void )
 {
-       NTSTATUS       nt_status = NT_STATUS_OK;
-       NT_USER_TOKEN *ptoken;
-       int i;
-       int sid_ndx;
+       static NT_USER_TOKEN *token = NULL;
+       DOM_SID u_sid, g_sid;
+       struct passwd *pw;
        
-       if ((ptoken = malloc( sizeof(NT_USER_TOKEN) ) ) == NULL) {
-               DEBUG(0, ("create_nt_token: Out of memory allocating token\n"));
-               nt_status = NT_STATUS_NO_MEMORY;
-               return nt_status;
+       if ( token )
+               return token;
+               
+       if ( !(pw = sys_getpwnam( "root" )) ) {
+               DEBUG(0,("get_root_nt_token: getpwnam\"root\") failed!\n"));
+               return NULL;
        }
+       
+       /* get the user and primary group SIDs; although the 
+          BUILTIN\Administrators SId is really the one that matters here */
+          
+       uid_to_sid(&u_sid, pw->pw_uid);
+       gid_to_sid(&g_sid, pw->pw_gid);
 
-       ZERO_STRUCTP(ptoken);
+       token = create_local_nt_token(NULL, &u_sid, &g_sid, False,
+                                     1, &global_sid_Builtin_Administrators);
+       return token;
+}
 
-       ptoken->num_sids = n_groupSIDs + 5;
+static int server_info_dtor(void *p)
+{
+       auth_serversupplied_info *server_info =
+               talloc_get_type_abort(p, auth_serversupplied_info);
 
-       if ((ptoken->user_sids = (DOM_SID *)malloc( sizeof(DOM_SID) * ptoken->num_sids )) == NULL) {
-               DEBUG(0, ("create_nt_token: Out of memory allocating SIDs\n"));
-               nt_status = NT_STATUS_NO_MEMORY;
-               return nt_status;
+       if (server_info->sam_account != NULL) {
+               TALLOC_FREE(server_info->sam_account);
        }
-       
-       memset((char*)ptoken->user_sids,0,sizeof(DOM_SID) * ptoken->num_sids);
-       
-       /*
-        * Note - user SID *MUST* be first in token !
-        * se_access_check depends on this.
-        *
-        * Primary group SID is second in token. Convention.
-        */
-
-       sid_copy(&ptoken->user_sids[PRIMARY_USER_SID_INDEX], user_sid);
-       if (group_sid)
-               sid_copy(&ptoken->user_sids[PRIMARY_GROUP_SID_INDEX], group_sid);
 
-       /*
-        * Finally add the "standard" SIDs.
-        * The only difference between guest and "anonymous" (which we
-        * don't really support) is the addition of Authenticated_Users.
-        */
+       ZERO_STRUCTP(server_info);
+       return 0;
+}
 
-       sid_copy(&ptoken->user_sids[2], &global_sid_World);
-       sid_copy(&ptoken->user_sids[3], &global_sid_Network);
+/***************************************************************************
+ Make a server_info struct. Free with TALLOC_FREE().
+***************************************************************************/
 
-       if (is_guest)
-               sid_copy(&ptoken->user_sids[4], &global_sid_Builtin_Guests);
-       else
-               sid_copy(&ptoken->user_sids[4], &global_sid_Authenticated_Users);
-       
-       sid_ndx = 5; /* next available spot */
+static auth_serversupplied_info *make_server_info(TALLOC_CTX *mem_ctx)
+{
+       struct auth_serversupplied_info *result;
 
-       for (i = 0; i < n_groupSIDs; i++) {
-               size_t check_sid_idx;
-               for (check_sid_idx = 1; check_sid_idx < ptoken->num_sids; check_sid_idx++) {
-                       if (sid_equal(&ptoken->user_sids[check_sid_idx], 
-                                     &groupSIDs[i])) {
-                               break;
-                       }
-               }
-               
-               if (check_sid_idx >= ptoken->num_sids) /* Not found already */ {
-                       sid_copy(&ptoken->user_sids[sid_ndx++], &groupSIDs[i]);
-               } else {
-                       ptoken->num_sids--;
-               }
+       result = TALLOC_ZERO_P(mem_ctx, auth_serversupplied_info);
+       if (result == NULL) {
+               DEBUG(0, ("talloc failed\n"));
+               return NULL;
        }
-       
-       debug_nt_user_token(DBGC_AUTH, 10, ptoken);
-       
-       *token = ptoken;
 
-       return nt_status;
+       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;
 }
 
-/****************************************************************************
- Create the SID list for this user.
-****************************************************************************/
+/***************************************************************************
+ Make (and fill) a user_info struct from a struct samu
+***************************************************************************/
 
-NT_USER_TOKEN *create_nt_token(uid_t uid, gid_t gid, int ngroups, gid_t *groups, BOOL is_guest)
+NTSTATUS make_server_info_sam(auth_serversupplied_info **server_info, 
+                             struct samu *sampass)
 {
-       DOM_SID user_sid;
-       DOM_SID group_sid;
-       DOM_SID *group_sids;
-       NT_USER_TOKEN *token;
-       int i;
+       NTSTATUS status;
+       struct passwd *pwd;
+       gid_t *gids;
+       auth_serversupplied_info *result;
 
-       if (!NT_STATUS_IS_OK(uid_to_sid(&user_sid, uid))) {
-               return NULL;
-       }
-       if (!NT_STATUS_IS_OK(gid_to_sid(&group_sid, gid))) {
-               return NULL;
+       if ( !(pwd = getpwnam_alloc(NULL, pdb_get_username(sampass))) ) {
+               DEBUG(1, ("User %s in passdb, but getpwnam() fails!\n",
+                         pdb_get_username(sampass)));
+               return NT_STATUS_NO_SUCH_USER;
        }
 
-       group_sids = malloc(sizeof(DOM_SID) * ngroups);
-       if (!group_sids) {
-               DEBUG(0, ("create_nt_token: malloc() failed for DOM_SID list!\n"));
-               return NULL;
+       if ( !(result = make_server_info(NULL)) ) {
+               TALLOC_FREE(pwd);
+               return NT_STATUS_NO_MEMORY;
        }
 
-       for (i = 0; i < ngroups; i++) {
-               if (!NT_STATUS_IS_OK(gid_to_sid(&(group_sids)[i], (groups)[i]))) {
-                       DEBUG(1, ("create_nt_token: failed to convert gid %ld to a sid!\n", (long int)groups[i]));
-                       SAFE_FREE(group_sids);
-                       return NULL;
-               }
-       }
+       result->sam_account = sampass;
+       result->unix_name = talloc_strdup(result, pwd->pw_name);
+       result->gid = pwd->pw_gid;
+       result->uid = pwd->pw_uid;
+       
+       TALLOC_FREE(pwd);
 
-       if (!NT_STATUS_IS_OK(create_nt_user_token(&user_sid, &group_sid, 
-                                                 ngroups, group_sids, is_guest, &token))) {
-               SAFE_FREE(group_sids);
-               return NULL;
+       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;
        }
 
-       SAFE_FREE(group_sids);
+       /* 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);
 
-       return token;
+       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;
 }
 
-/******************************************************************************
- * this function returns the groups (SIDs) of the local SAM the user is in.
- * If this samba server is a DC of the domain the user belongs to, it returns 
- * both domain groups and local / builtin groups. If the user is in a trusted
- * domain, or samba is a member server of a domain, then this function returns
- * local and builtin groups the user is a member of.
- *
- * currently this is a hack, as there is no sam implementation that is capable
- * of groups.
- *
- * NOTE!! This function will fail if you pass in a winbind user without 
- * the domain   --jerry
- ******************************************************************************/
+/*
+ * Add alias SIDs from memberships within the partially created token SID list
+ */
 
-static NTSTATUS get_user_groups(const char *username, uid_t uid, gid_t gid,
-                                int *n_groups, DOM_SID **groups, gid_t **unix_groups)
+static NTSTATUS add_aliases(TALLOC_CTX *tmp_ctx, const DOM_SID *domain_sid,
+                           struct nt_user_token *token)
 {
-       int             n_unix_groups;
-       int             i;
+       uint32 *aliases;
+       size_t i, num_aliases;
+       NTSTATUS status;
+
+       aliases = NULL;
+       num_aliases = 0;
+
+       status = pdb_enum_alias_memberships(tmp_ctx, domain_sid,
+                                           token->user_sids,
+                                           token->num_sids,
+                                           &aliases, &num_aliases);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(10, ("pdb_enum_alias_memberships failed: %s\n",
+                          nt_errstr(status)));
+               return status;
+       }
+
+       for (i=0; i<num_aliases; i++) {
+               DOM_SID alias_sid;
+               sid_compose(&alias_sid, domain_sid, aliases[i]);
+               add_sid_to_array_unique(token, &alias_sid,
+                                       &token->user_sids,
+                                       &token->num_sids);
+               if (token->user_sids == NULL) {
+                       DEBUG(0, ("add_sid_to_array failed\n"));
+                       return NT_STATUS_NO_MEMORY;
+               }
+       }
 
-       *n_groups = 0;
-       *groups   = NULL;
-       
-       /* Try winbind first */
+       return NT_STATUS_OK;
+}
 
-       if ( strchr(username, *lp_winbind_separator()) ) {
-               n_unix_groups = winbind_getgroups( username, unix_groups );
+static NTSTATUS log_nt_token(TALLOC_CTX *tmp_ctx, NT_USER_TOKEN *token)
+{
+       char *command;
+       char *group_sidstr;
+       size_t i;
 
-               DEBUG(10,("get_user_groups: winbind_getgroups(%s): result = %s\n", username, 
-                         n_unix_groups == -1 ? "FAIL" : "SUCCESS"));
-                         
-               if ( n_unix_groups == -1 )
-                       return NT_STATUS_NO_SUCH_USER; /* what should this return value be? */  
+       if ((lp_log_nt_token_command() == NULL) ||
+           (strlen(lp_log_nt_token_command()) == 0)) {
+               return NT_STATUS_OK;
        }
-       else {
-               /* fallback to getgrouplist() */
-               
-               n_unix_groups = groups_max();
-               
-               if ((*unix_groups = malloc( sizeof(gid_t) * n_unix_groups ) ) == NULL) {
-                       DEBUG(0, ("get_user_groups: Out of memory allocating unix group list\n"));
-                       return NT_STATUS_NO_MEMORY;
-               }
-       
-               if (sys_getgrouplist(username, gid, *unix_groups, &n_unix_groups) == -1) {
-               
-                       gid_t *groups_tmp;
-                       
-                       groups_tmp = Realloc(*unix_groups, sizeof(gid_t) * n_unix_groups);
-                       
-                       if (!groups_tmp) {
-                               SAFE_FREE(*unix_groups);
-                               return NT_STATUS_NO_MEMORY;
-                       }
-                       *unix_groups = groups_tmp;
 
-                       if (sys_getgrouplist(username, gid, *unix_groups, &n_unix_groups) == -1) {
-                               DEBUG(0, ("get_user_groups: failed to get the unix group list\n"));
-                               SAFE_FREE(*unix_groups);
-                               return NT_STATUS_NO_SUCH_USER; /* what should this return value be? */
-                       }
-               }
+       group_sidstr = talloc_strdup(tmp_ctx, "");
+       for (i=1; i<token->num_sids; i++) {
+               group_sidstr = talloc_asprintf(
+                       tmp_ctx, "%s %s", group_sidstr,
+                       sid_string_static(&token->user_sids[i]));
        }
 
-       debug_unix_user_token(DBGC_CLASS, 5, uid, gid, n_unix_groups, *unix_groups);
-       
-       /* now setup the space for storing the SIDS */
-       
-       if (n_unix_groups > 0) {
-       
-               *groups   = malloc(sizeof(DOM_SID) * n_unix_groups);
-               
-               if (!*groups) {
-                       DEBUG(0, ("get_user_group: malloc() failed for DOM_SID list!\n"));
-                       SAFE_FREE(*unix_groups);
-                       return NT_STATUS_NO_MEMORY;
-               }
-       }
+       command = talloc_string_sub(
+               tmp_ctx, lp_log_nt_token_command(),
+               "%s", sid_string_static(&token->user_sids[0]));
+       command = talloc_string_sub(tmp_ctx, command, "%t", group_sidstr);
 
-       *n_groups = n_unix_groups;
+       if (command == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
 
-       for (i = 0; i < *n_groups; i++) {
-               if (!NT_STATUS_IS_OK(gid_to_sid(&(*groups)[i], (*unix_groups)[i]))) {
-                       DEBUG(1, ("get_user_groups: failed to convert gid %ld to a sid!\n", 
-                               (long int)(*unix_groups)[i+1]));
-                       SAFE_FREE(*groups);
-                       SAFE_FREE(*unix_groups);
-                       return NT_STATUS_NO_SUCH_USER;
-               }
+       DEBUG(8, ("running command: [%s]\n", command));
+       if (smbrun(command, NULL) != 0) {
+               DEBUG(0, ("Could not log NT token\n"));
+               return NT_STATUS_ACCESS_DENIED;
        }
-                    
+
        return NT_STATUS_OK;
 }
 
-/***************************************************************************
- Make a user_info struct
-***************************************************************************/
+/*******************************************************************
+*******************************************************************/
 
-static NTSTATUS make_server_info(auth_serversupplied_info **server_info)
+static NTSTATUS add_builtin_administrators( TALLOC_CTX *ctx, struct nt_user_token *token )
 {
-       *server_info = malloc(sizeof(**server_info));
-       if (!*server_info) {
-               DEBUG(0,("make_server_info: malloc failed!\n"));
-               return NT_STATUS_NO_MEMORY;
-       }
-       ZERO_STRUCTP(*server_info);
-
-       /* 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. */
-
-       (*server_info)->uid = -1;
-       (*server_info)->gid = -1;
+       DOM_SID domadm;
 
+       /* nothing to do if we aren't in a domain */
+       
+       if ( !(IS_DC || lp_server_role()==ROLE_DOMAIN_MEMBER) ) {
+               return NT_STATUS_OK;
+       }
+       
+       /* Find the Domain Admins SID */
+       
+       if ( IS_DC ) {
+               sid_copy( &domadm, get_global_sam_sid() );
+       } else {
+               if ( !secrets_fetch_domain_sid( lp_workgroup(), &domadm ) )
+                       return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
+       }
+       sid_append_rid( &domadm, DOMAIN_GROUP_RID_ADMINS );
+       
+       /* Add Administrators if the user beloongs to Domain Admins */
+       
+       if ( nt_token_check_sid( &domadm, token ) ) {
+               add_sid_to_array(token, &global_sid_Builtin_Administrators,
+                                &token->user_sids, &token->num_sids);
+       }
+       
        return NT_STATUS_OK;
 }
 
-/***************************************************************************
-Fill a server_info struct from a SAM_ACCOUNT with their groups
-***************************************************************************/
+/*******************************************************************
+*******************************************************************/
 
-static NTSTATUS add_user_groups(auth_serversupplied_info **server_info, 
-                               SAM_ACCOUNT *sampass,
-                               uid_t uid, gid_t gid)
+static NTSTATUS create_builtin_users( void )
 {
-       NTSTATUS nt_status;
-       const DOM_SID *user_sid = pdb_get_user_sid(sampass);
-       const DOM_SID *group_sid = pdb_get_group_sid(sampass);
-       int       n_groupSIDs = 0;
-       DOM_SID  *groupSIDs   = NULL;
-       gid_t    *unix_groups = NULL;
-       NT_USER_TOKEN *token;
-       BOOL is_guest;
-       uint32 rid;
+       NTSTATUS status;
+       DOM_SID dom_users;
 
-       nt_status = get_user_groups(pdb_get_username(sampass), uid, gid, 
-               &n_groupSIDs, &groupSIDs, &unix_groups);
-               
-       if (!NT_STATUS_IS_OK(nt_status)) {
-               DEBUG(4,("get_user_groups_from_local_sam failed\n"));
-               free_server_info(server_info);
-               return nt_status;
+       status = pdb_create_builtin_alias( BUILTIN_ALIAS_RID_USERS );
+       if ( !NT_STATUS_IS_OK(status) ) {
+               DEBUG(0,("create_builtin_users: Failed to create Users\n"));
+               return status;
        }
        
-       is_guest = (sid_peek_rid(user_sid, &rid) && rid == DOMAIN_USER_RID_GUEST);
-
-       if (!NT_STATUS_IS_OK(nt_status = create_nt_user_token(user_sid, group_sid,
-                                                             n_groupSIDs, groupSIDs, is_guest, 
-                                                             &token)))
+       /* add domain users */
+       if ((IS_DC || (lp_server_role() == ROLE_DOMAIN_MEMBER)) 
+               && secrets_fetch_domain_sid(lp_workgroup(), &dom_users))
        {
-               DEBUG(4,("create_nt_user_token failed\n"));
-               SAFE_FREE(groupSIDs);
-               SAFE_FREE(unix_groups);
-               free_server_info(server_info);
-               return nt_status;
+               sid_append_rid(&dom_users, DOMAIN_GROUP_RID_USERS );
+               status = pdb_add_aliasmem( &global_sid_Builtin_Users, &dom_users);
+               if ( !NT_STATUS_IS_OK(status) ) {
+                       DEBUG(0,("create_builtin_administrators: Failed to add Domain Users to"
+                               " Users\n"));
+                       return status;
+               }
        }
-       
-       SAFE_FREE(groupSIDs);
+                       
+       return NT_STATUS_OK;
+}              
 
-       (*server_info)->n_groups = n_groupSIDs;
-       (*server_info)->groups = unix_groups;
-       (*server_info)->ptok = token;
+/*******************************************************************
+*******************************************************************/
 
-       return nt_status;
-}
+static NTSTATUS create_builtin_administrators( void )
+{
+       NTSTATUS status;
+       DOM_SID dom_admins, root_sid;
+       fstring root_name;
+       enum SID_NAME_USE type;         
+       TALLOC_CTX *ctx;
+       BOOL ret;
 
-/***************************************************************************
- Make (and fill) a user_info struct from a SAM_ACCOUNT
-***************************************************************************/
+       status = pdb_create_builtin_alias( BUILTIN_ALIAS_RID_ADMINS );
+       if ( !NT_STATUS_IS_OK(status) ) {
+               DEBUG(0,("create_builtin_administrators: Failed to create Administrators\n"));
+               return status;
+       }
+       
+       /* add domain admins */
+       if ((IS_DC || (lp_server_role() == ROLE_DOMAIN_MEMBER)) 
+               && secrets_fetch_domain_sid(lp_workgroup(), &dom_admins))
+       {
+               sid_append_rid(&dom_admins, DOMAIN_GROUP_RID_ADMINS);
+               status = pdb_add_aliasmem( &global_sid_Builtin_Administrators, &dom_admins );
+               if ( !NT_STATUS_IS_OK(status) ) {
+                       DEBUG(0,("create_builtin_administrators: Failed to add Domain Admins"
+                               " Administrators\n"));
+                       return status;
+               }
+       }
+                       
+       /* add root */
+       if ( (ctx = talloc_init(NULL)) == NULL ) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       fstr_sprintf( root_name, "%s\\root", get_global_sam_name() );
+       ret = lookup_name( ctx, root_name, 0, NULL, NULL, &root_sid, &type );
+       TALLOC_FREE( ctx );
 
-NTSTATUS make_server_info_sam(auth_serversupplied_info **server_info, 
-                             SAM_ACCOUNT *sampass)
+       if ( ret ) {
+               status = pdb_add_aliasmem( &global_sid_Builtin_Administrators, &root_sid );
+               if ( !NT_STATUS_IS_OK(status) ) {
+                       DEBUG(0,("create_builtin_administrators: Failed to add root"
+                               " Administrators\n"));
+                       return status;
+               }
+       }
+       
+       return NT_STATUS_OK;
+}              
+
+/*******************************************************************
+ Create a NT token for the user, expanding local aliases
+*******************************************************************/
+
+static struct nt_user_token *create_local_nt_token(TALLOC_CTX *mem_ctx,
+                                                  const DOM_SID *user_sid,
+                                                  const DOM_SID *group_sid,
+                                                  BOOL is_guest,
+                                                  int num_groupsids,
+                                                  const DOM_SID *groupsids)
 {
-       NTSTATUS nt_status;
-       struct passwd *pwd;
+       TALLOC_CTX *tmp_ctx;
+       struct nt_user_token *result = NULL;
+       int i;
+       NTSTATUS status;
+       gid_t gid;
 
-       if (!NT_STATUS_IS_OK(nt_status = make_server_info(server_info)))
-               return nt_status;
+       tmp_ctx = talloc_new(mem_ctx);
+       if (tmp_ctx == NULL) {
+               DEBUG(0, ("talloc_new failed\n"));
+               return NULL;
+       }
 
-       (*server_info)->sam_account    = sampass;
+       result = TALLOC_ZERO_P(tmp_ctx, NT_USER_TOKEN);
+       if (result == NULL) {
+               DEBUG(0, ("talloc failed\n"));
+               goto done;
+       }
 
-       if ( !(pwd = getpwnam_alloc(pdb_get_username(sampass))) )  {
-               DEBUG(1, ("User %s in passdb, but getpwnam() fails!\n",
-                         pdb_get_username(sampass)));
-               free_server_info(server_info);
-               return NT_STATUS_NO_SUCH_USER;
+       /* Add the user and primary group sid */
+
+       add_sid_to_array(result, user_sid,
+                        &result->user_sids, &result->num_sids);
+       add_sid_to_array(result, group_sid,
+                        &result->user_sids, &result->num_sids);
+                        
+       /* Add in BUILTIN sids */
+       
+       add_sid_to_array(result, &global_sid_World,
+                        &result->user_sids, &result->num_sids);
+       add_sid_to_array(result, &global_sid_Network,
+                        &result->user_sids, &result->num_sids);
+
+       if (is_guest) {
+               add_sid_to_array(result, &global_sid_Builtin_Guests,
+                                &result->user_sids, &result->num_sids);
+       } else {
+               add_sid_to_array(result, &global_sid_Authenticated_Users,
+                                &result->user_sids, &result->num_sids);
        }
-       (*server_info)->unix_name = smb_xstrdup(pwd->pw_name);
-       (*server_info)->gid = pwd->pw_gid;
-       (*server_info)->uid = pwd->pw_uid;
        
-       passwd_free(&pwd);
+       /* Now the SIDs we got from authentication. These are the ones from
+        * the info3 struct or from the pdb_enum_group_memberships, depending
+        * on who authenticated the user. */
 
-       if (!NT_STATUS_IS_OK(nt_status = add_user_groups(server_info, sampass, 
-                                                        (*server_info)->uid, 
-                                                        (*server_info)->gid))) {
-               free_server_info(server_info);
-               return nt_status;
+       for (i=0; i<num_groupsids; i++) {
+               add_sid_to_array_unique(result, &groupsids[i],
+                                       &result->user_sids, &result->num_sids);
        }
+       
+       /* Deal with the BUILTIN\Administrators group.  If the SID can
+          be resolved then assume that the add_aliasmem( S-1-5-32 ) 
+          handled it. */
 
-       (*server_info)->sam_fill_level = SAM_FILL_ALL;
-       DEBUG(5,("make_server_info_sam: made server info for user %s -> %s\n",
-                pdb_get_username(sampass),
-                (*server_info)->unix_name));
+       if ( !sid_to_gid( &global_sid_Builtin_Administrators, &gid ) ) {
+               /* We can only create a mapping if winbind is running 
+                  and the nested group functionality has been enabled */
+                  
+               if ( lp_winbind_nested_groups() && winbind_ping() ) {
+                       become_root();
+                       status = create_builtin_administrators( );
+                       if ( !NT_STATUS_IS_OK(status) ) {
+                               DEBUG(0,("create_local_nt_token: Failed to create BUILTIN\\Administrators group!\n"));
+                               /* don't fail, just log the message */
+                       }
+                       unbecome_root();
+               }
+               else {
+                       status = add_builtin_administrators( tmp_ctx, result ); 
+                       if ( !NT_STATUS_IS_OK(status) ) {
+                               /* just log a complaint but do not fail */
+                               DEBUG(3,("create_local_nt_token: failed to check for local Administrators"
+                                       " membership (%s)\n", nt_errstr(status)));
+                       }                       
+               }               
+       }
+
+       /* Deal with the BUILTIN\Users group.  If the SID can
+          be resolved then assume that the add_aliasmem( S-1-5-32 ) 
+          handled it. */
+
+       if ( !sid_to_gid( &global_sid_Builtin_Users, &gid ) ) {
+               /* We can only create a mapping if winbind is running 
+                  and the nested group functionality has been enabled */
+                  
+               if ( lp_winbind_nested_groups() && winbind_ping() ) {
+                       become_root();
+                       status = create_builtin_users( );
+                       if ( !NT_STATUS_IS_OK(status) ) {
+                               DEBUG(0,("create_local_nt_token: Failed to create BUILTIN\\Administrators group!\n"));
+                               /* don't fail, just log the message */
+                       }
+                       unbecome_root();
+               }
+       }
 
-       return nt_status;
-}
+       /* Deal with local groups */
+       
+       if (lp_winbind_nested_groups()) {
 
-/***************************************************************************
- Make (and fill) a user_info struct from a 'struct passwd' by conversion 
- to a SAM_ACCOUNT
-***************************************************************************/
+               /* Now add the aliases. First the one from our local SAM */
 
-NTSTATUS make_server_info_pw(auth_serversupplied_info **server_info, const struct passwd *pwd)
-{
-       NTSTATUS nt_status;
-       SAM_ACCOUNT *sampass = NULL;
-       if (!NT_STATUS_IS_OK(nt_status = pdb_init_sam_pw(&sampass, pwd))) {             
-               return nt_status;
-       }
-       if (!NT_STATUS_IS_OK(nt_status = make_server_info(server_info))) {
-               return nt_status;
-       }
+               status = add_aliases(tmp_ctx, get_global_sam_sid(), result);
 
-       (*server_info)->sam_account    = sampass;
+               if (!NT_STATUS_IS_OK(status)) {
+                       result = NULL;
+                       goto done;
+               }
 
-       if (!NT_STATUS_IS_OK(nt_status = add_user_groups(server_info, sampass, pwd->pw_uid, pwd->pw_gid))) {
-               return nt_status;
-       }
+               /* Finally the builtin ones */
 
-       (*server_info)->unix_name = smb_xstrdup(pwd->pw_name);
+               status = add_aliases(tmp_ctx, &global_sid_Builtin, result);
 
-       (*server_info)->sam_fill_level = SAM_FILL_ALL;
-       (*server_info)->uid = pwd->pw_uid;
-       (*server_info)->gid = pwd->pw_gid;
-       return nt_status;
+               if (!NT_STATUS_IS_OK(status)) {
+                       result = NULL;
+                       goto done;
+               }
+       } 
+
+
+       get_privileges_for_sids(&result->privileges, result->user_sids,
+                               result->num_sids);
+
+       talloc_steal(mem_ctx, result);
+
+ done:
+       TALLOC_FREE(tmp_ctx);
+       return result;
+}
+
+/*
+ * Create the token to use from server_info->sam_account and
+ * server_info->sids (the info3/sam groups). Find the unix gids.
+ */
+
+NTSTATUS create_local_token(auth_serversupplied_info *server_info)
+{
+       TALLOC_CTX *mem_ctx;
+       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 (server_info->was_mapped) {
+               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),
+                       pdb_get_group_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;
+       }
+
+       if (!NT_STATUS_IS_OK(status)) {
+               TALLOC_FREE(mem_ctx);
+               return status;
+       }
+       
+       /* 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_static(sid)));
+                       continue;
+               }
+               add_gid_to_array_unique(server_info, gid, &server_info->groups,
+                                       &server_info->n_groups);
+       }
+       
+       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 SID_NAME_USE type;
+       gid_t *gids;
+       DOM_SID primary_group_sid;
+       DOM_SID *group_sids;
+       size_t num_group_sids;
+
+       tmp_ctx = talloc_new(NULL);
+       if (tmp_ctx == NULL) {
+               DEBUG(0, ("talloc_new failed\n"));
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       if (!lookup_name(tmp_ctx, username, LOOKUP_NAME_ALL,
+                        NULL, NULL, &user_sid, &type)) {
+               DEBUG(1, ("lookup_name for %s failed\n", username));
+               goto done;
+       }
+
+       if (type != SID_NAME_USER) {
+               DEBUG(1, ("%s is a %s, not a user\n", username,
+                         sid_type_lookup(type)));
+               goto done;
+       }
+
+       if (!sid_to_uid(&user_sid, uid)) {
+               DEBUG(1, ("sid_to_uid for %s (%s) failed\n",
+                         username, sid_string_static(&user_sid)));
+               goto done;
+       }
+
+       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;
+               size_t i;
+
+               pass = getpwuid_alloc(tmp_ctx, *uid);
+               if (pass == NULL) {
+                       DEBUG(1, ("getpwuid(%d) for user %s failed\n",
+                                 *uid, username));
+                       goto done;
+               }
+
+               *gid = pass->pw_gid;
+               gid_to_sid(&primary_group_sid, pass->pw_gid);
+
+               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;
+               }
+
+               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;
+               }
+
+               for (i=0; i<num_group_sids; i++) {
+                       gid_to_sid(&group_sids[i], gids[i]);
+               }
+               *found_username = talloc_strdup(mem_ctx, pass->pw_name);
+
+       } else if (sid_check_is_in_our_domain(&user_sid)) {
+
+               /* This is a passdb user, so ask passdb */
+
+               struct samu *sam_acct = NULL;
+               const DOM_SID *gr_sid = NULL;
+
+               if ( !(sam_acct = samu_new( tmp_ctx )) ) {
+                       result = NT_STATUS_NO_MEMORY;
+                       goto done;
+               }
+
+               if (!pdb_getsampwsid(sam_acct, &user_sid)) {
+                       DEBUG(1, ("pdb_getsampwsid(%s) for user %s failed\n",
+                                 sid_string_static(&user_sid), username));
+                       result = NT_STATUS_NO_SUCH_USER;
+                       goto done;
+               }
+
+               gr_sid = pdb_get_group_sid(sam_acct);
+               if (!gr_sid) {
+                       result = NT_STATUS_NO_MEMORY;
+                       goto done;
+               }
+
+               sid_copy(&primary_group_sid, gr_sid);
+
+               if (!sid_to_gid(&primary_group_sid, gid)) {
+                       DEBUG(1, ("sid_to_gid(%s) failed\n",
+                                 sid_string_static(&primary_group_sid)));
+                       goto done;
+               }
+
+               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));
+                       goto done;
+               }
+
+               *found_username = talloc_strdup(mem_ctx,
+                                               pdb_get_username(sam_acct));
+
+       } else {
+
+               /* 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;
+
+               sid_copy(&primary_group_sid, &user_sid);
+               sid_split_rid(&primary_group_sid, &dummy);
+               sid_append_rid(&primary_group_sid, DOMAIN_GROUP_RID_USERS);
+
+               if (!sid_to_gid(&primary_group_sid, gid)) {
+                       DEBUG(1, ("sid_to_gid(%s) failed\n",
+                                 sid_string_static(&primary_group_sid)));
+                       goto done;
+               }
+
+               num_group_sids = 0;
+               group_sids = NULL;
+
+               *found_username = talloc_strdup(mem_ctx, username);
+       }
+
+       *token = create_local_nt_token(mem_ctx, &user_sid, &primary_group_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.
+***************************************************************************/
+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;
+
+       TALLOC_CTX *mem_ctx;
+
+       mem_ctx = talloc_new(NULL);
+       if (mem_ctx == NULL) {
+               DEBUG(0, ("talloc_new failed\n"));
+               return False;
+       }
+
+       status = create_token_from_username(mem_ctx, username, False,
+                                           &uid, &gid, &found_username,
+                                           &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 user_in_group_sid(username, &group_sid);
+}
+
+
+/***************************************************************************
+ Make (and fill) a user_info struct from a 'struct passwd' by conversion 
+ to a struct samu
+***************************************************************************/
+
+NTSTATUS make_server_info_pw(auth_serversupplied_info **server_info, 
+                             char *unix_username,
+                            struct passwd *pwd)
+{
+       NTSTATUS status;
+       struct samu *sampass = NULL;
+       gid_t *gids;
+       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;
+       }
+
+       /* 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);
+
+       *server_info = result;
+
+       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.
 ***************************************************************************/
 
-NTSTATUS make_server_info_guest(auth_serversupplied_info **server_info)
+static NTSTATUS make_new_server_info_guest(auth_serversupplied_info **server_info)
 {
-       NTSTATUS nt_status;
-       SAM_ACCOUNT *sampass = NULL;
+       NTSTATUS status;
+       struct samu *sampass = NULL;
        DOM_SID guest_sid;
+       BOOL ret;
+       static const char zeros[16];
 
-       if (!NT_STATUS_IS_OK(nt_status = pdb_init_sam(&sampass))) {
-               return nt_status;
+       if ( !(sampass = samu_new( NULL )) ) {
+               return NT_STATUS_NO_MEMORY;
        }
 
        sid_copy(&guest_sid, get_global_sam_sid());
        sid_append_rid(&guest_sid, DOMAIN_USER_RID_GUEST);
 
        become_root();
-       if (!pdb_getsampwsid(sampass, &guest_sid)) {
-               unbecome_root();
+       ret = pdb_getsampwsid(sampass, &guest_sid);
+       unbecome_root();
+
+       if (!ret) {
+               TALLOC_FREE(sampass);
                return NT_STATUS_NO_SUCH_USER;
        }
-       unbecome_root();
 
-       nt_status = make_server_info_sam(server_info, sampass);
+       status = make_server_info_sam(server_info, sampass);
+       if (!NT_STATUS_IS_OK(status)) {
+               TALLOC_FREE(sampass);
+               return status;
+       }
+       
+       (*server_info)->guest = True;
 
-       if (NT_STATUS_IS_OK(nt_status)) {
-               (*server_info)->guest = True;
+       status = create_local_token(*server_info);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(10, ("create_local_token failed: %s\n",
+                          nt_errstr(status)));
+               return status;
        }
 
-       return nt_status;
+       /* annoying, but the Guest really does have a session key, and it is
+          all zeros! */
+       (*server_info)->user_session_key = data_blob(zeros, sizeof(zeros));
+       (*server_info)->lm_session_key = data_blob(zeros, sizeof(zeros));
+
+       return NT_STATUS_OK;
+}
+
+static auth_serversupplied_info *copy_serverinfo(auth_serversupplied_info *src)
+{
+       auth_serversupplied_info *dst;
+
+       dst = make_server_info(NULL);
+       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 = talloc_memdup(dst, src->groups,
+                                           sizeof(gid_t)*dst->n_groups);
+       } else {
+               dst->groups = NULL;
+       }
+
+       if (src->ptok) {
+               dst->ptok = dup_nt_token(dst, src->ptok);
+               if (!dst->ptok) {
+                       TALLOC_FREE(dst);
+                       return 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);
+
+       dst->sam_account = samu_new(NULL);
+       if (!dst->sam_account) {
+               TALLOC_FREE(dst);
+               return NULL;
+       }
+
+       if (!pdb_copy_sam_account(dst->sam_account, src->sam_account)) {
+               TALLOC_FREE(dst);
+               return NULL;
+       }
+       
+       dst->pam_handle = NULL;
+       dst->unix_name = talloc_strdup(dst, src->unix_name);
+       if (!dst->unix_name) {
+               TALLOC_FREE(dst);
+               return NULL;
+       }
+
+       return dst;
+}
+
+static auth_serversupplied_info *guest_info = NULL;
+
+BOOL init_guest_info(void)
+{
+       if (guest_info != NULL)
+               return True;
+
+       return NT_STATUS_IS_OK(make_new_server_info_guest(&guest_info));
+}
+
+NTSTATUS make_server_info_guest(auth_serversupplied_info **server_info)
+{
+       *server_info = copy_serverinfo(guest_info);
+       return (*server_info != NULL) ? NT_STATUS_OK : NT_STATUS_NO_MEMORY;
 }
 
 /***************************************************************************
@@ -915,64 +1441,130 @@ static NTSTATUS fill_sam_account(TALLOC_CTX *mem_ctx,
                                 const char *username,
                                 char **found_username,
                                 uid_t *uid, gid_t *gid,
-                                SAM_ACCOUNT **sam_account)
+                                struct samu *account,
+                                BOOL *username_was_mapped)
 {
-       fstring dom_user;
+       NTSTATUS nt_status;
+       fstring dom_user, lower_username;
+       fstring real_username;
        struct passwd *passwd;
 
-       fstr_sprintf(dom_user, "%s%s%s",
-                    domain, lp_winbind_separator(), username);
+       fstrcpy( lower_username, username );
+       strlower_m( lower_username );
 
-       passwd = Get_Pwnam(dom_user);
+       fstr_sprintf(dom_user, "%s%c%s", domain, *lp_winbind_separator(), 
+               lower_username);
 
-       /* if the lookup for DOMAIN\username failed, try again 
-          with just 'username'.  This is need for accessing the server
-          as a trust user that actually maps to a local account */
+       /* Get the passwd struct.  Try to create the account is necessary. */
 
-       if ( !passwd ) {
-               fstrcpy( dom_user, username );
-               passwd = Get_Pwnam( dom_user );
-       }
+       *username_was_mapped = map_username( dom_user );
 
-       if (passwd == NULL)
+       if ( !(passwd = smb_getpwnam( NULL, dom_user, real_username, True )) )
                return NT_STATUS_NO_SUCH_USER;
 
        *uid = passwd->pw_uid;
        *gid = passwd->pw_gid;
 
-       /* This is pointless -- there is no suport for differeing 
+       /* This is pointless -- there is no suport 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, dom_user);
+       *found_username = talloc_strdup( mem_ctx, real_username );
+       
+       DEBUG(5,("fill_sam_account: located username was [%s]\n", *found_username));
 
-       return pdb_init_sam_pw(sam_account, passwd);
+       nt_status = samu_set_unix( account, passwd );
+       
+       TALLOC_FREE(passwd);
+       
+       return nt_status;
 }
 
 /****************************************************************************
- Wrapper to allow the getpwnam() call to styrip the domain name and 
- try again in case a local UNIX user is already there.
+ Wrapper to allow the getpwnam() call to strip the domain name and 
+ 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( char *domuser )
+struct passwd *smb_getpwnam( TALLOC_CTX *mem_ctx, char *domuser,
+                            fstring save_username, BOOL create )
 {
-       struct passwd *pw;
+       struct passwd *pw = NULL;
        char *p;
+       fstring username;
+       
+       /* we only save a copy of the username it has been mangled 
+          by winbindd use default domain */
+          
+       save_username[0] = '\0';
+          
+       /* don't call map_username() here since it has to be done higher 
+          up the stack so we don't call it mutliple times */
 
-       pw = Get_Pwnam( domuser );
-       if ( pw )
-               return pw;
+       fstrcpy( username, domuser );
+       
+       p = strchr_m( username, *lp_winbind_separator() );
+       
+       /* code for a DOMAIN\user string */
+       
+       if ( p ) {
+               fstring strip_username;
 
-       /* fallback to looking up just the username */
+               pw = Get_Pwnam_alloc( mem_ctx, domuser );
+               if ( pw ) {     
+                       /* make sure we get the case of the username correct */
+                       /* work around 'winbind use default domain = yes' */
 
-       p = strchr( domuser, *lp_winbind_separator() );
+                       if ( !strchr_m( pw->pw_name, *lp_winbind_separator() ) ) {
+                               char *domain;
+                               
+                               /* split the domain and username into 2 strings */
+                               *p = '\0';
+                               domain = username;
 
-       if ( p )
-               return Get_Pwnam(p+1);
+                               fstr_sprintf(save_username, "%s%c%s", domain, *lp_winbind_separator(), pw->pw_name);
+                       }
+                       else
+                               fstrcpy( save_username, pw->pw_name );
 
-       return NULL;
+                       /* whew -- done! */             
+                       return pw;
+               }
+
+               /* setup for lookup of just the username */
+               /* remember that p and username are overlapping memory */
+
+               p++;
+               fstrcpy( strip_username, p );
+               fstrcpy( username, strip_username );
+       }
+       
+       /* 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);
+               pw = Get_Pwnam_alloc(mem_ctx, username);
+       }
+       
+       /* one last check for a valid passwd struct */
+       
+       if ( pw )
+               fstrcpy( save_username, pw->pw_name );
+
+       return pw;
 }
 
 /***************************************************************************
@@ -980,33 +1572,29 @@ struct passwd *smb_getpwnam( char *domuser )
 ***************************************************************************/
 
 NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx, 
-                               const char *internal_username,
                                const char *sent_nt_username,
                                const char *domain,
                                auth_serversupplied_info **server_info, 
                                NET_USER_INFO_3 *info3) 
 {
+       static const char zeros[16];
+
        NTSTATUS nt_status = NT_STATUS_OK;
        char *found_username;
        const char *nt_domain;
        const char *nt_username;
-
-       SAM_ACCOUNT *sam_account = NULL;
+       struct samu *sam_account = NULL;
        DOM_SID user_sid;
        DOM_SID group_sid;
+       BOOL username_was_mapped;
 
        uid_t uid;
        gid_t gid;
 
-       int n_lgroupSIDs;
-       DOM_SID *lgroupSIDs   = NULL;
-
-       gid_t *unix_groups = NULL;
-       NT_USER_TOKEN *token;
-
-       DOM_SID *all_group_SIDs;
        size_t i;
 
+       auth_serversupplied_info *result;
+
        /* 
           Here is where we should check the list of
           trusted domains, and verify that the SID 
@@ -1024,155 +1612,153 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
        }
 
        if (!(nt_username = unistr2_tdup(mem_ctx, &(info3->uni_user_name)))) {
-               /* If the server didn't give us one, just use the one we sent them */
+               /* If the server didn't give us one, just use the one we sent
+                * them */
                nt_username = sent_nt_username;
        }
 
        if (!(nt_domain = unistr2_tdup(mem_ctx, &(info3->uni_logon_dom)))) {
-               /* If the server didn't give us one, just use the one we sent them */
-               domain = domain;
+               /* If the server didn't give us one, just use the one we sent
+                * them */
+               nt_domain = domain;
        }
        
        /* try to fill the SAM account..  If getpwnam() fails, then try the 
-          add user script (2.2.x behavior) */
+          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 */
           
-       nt_status = fill_sam_account(mem_ctx, nt_domain, internal_username,
-               &found_username, &uid, &gid, &sam_account);
-
-       if (NT_STATUS_EQUAL(nt_status, NT_STATUS_NO_SUCH_USER)) {
-               DEBUG(3,("User %s does not exist, trying to add it\n", 
-                       internal_username));
-               auth_add_user_script(nt_domain, internal_username);
-               nt_status = fill_sam_account(mem_ctx, nt_domain, 
-                       internal_username, &found_username,
-                       &uid, &gid, &sam_account);
+       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,
+                                    &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)) {
-               DEBUG(0, ("make_server_info_info3: pdb_init_sam failed!\n"));
+               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)) {
-               pdb_free_sam(&sam_account);
+               TALLOC_FREE(sam_account);
                return NT_STATUS_NO_MEMORY;
        }
 
        if (!pdb_set_username(sam_account, nt_username, PDB_CHANGED)) {
-               pdb_free_sam(&sam_account);
+               TALLOC_FREE(sam_account);
                return NT_STATUS_NO_MEMORY;
        }
 
        if (!pdb_set_domain(sam_account, nt_domain, PDB_CHANGED)) {
-               pdb_free_sam(&sam_account);
+               TALLOC_FREE(sam_account);
                return NT_STATUS_NO_MEMORY;
        }
 
        if (!pdb_set_user_sid(sam_account, &user_sid, PDB_CHANGED)) {
-               pdb_free_sam(&sam_account);
+               TALLOC_FREE(sam_account);
                return NT_STATUS_UNSUCCESSFUL;
        }
 
        if (!pdb_set_group_sid(sam_account, &group_sid, PDB_CHANGED)) {
-               pdb_free_sam(&sam_account);
+               TALLOC_FREE(sam_account);
                return NT_STATUS_UNSUCCESSFUL;
        }
                
-       if (!pdb_set_fullname(sam_account, unistr2_static(&(info3->uni_full_name)), 
+       if (!pdb_set_fullname(sam_account,
+                             unistr2_static(&(info3->uni_full_name)), 
                              PDB_CHANGED)) {
-               pdb_free_sam(&sam_account);
+               TALLOC_FREE(sam_account);
                return NT_STATUS_NO_MEMORY;
        }
 
-       if (!pdb_set_logon_script(sam_account, unistr2_static(&(info3->uni_logon_script)), PDB_CHANGED)) {
-               pdb_free_sam(&sam_account);
+       if (!pdb_set_logon_script(sam_account,
+                                 unistr2_static(&(info3->uni_logon_script)),
+                                 PDB_CHANGED)) {
+               TALLOC_FREE(sam_account);
                return NT_STATUS_NO_MEMORY;
        }
 
-       if (!pdb_set_profile_path(sam_account, unistr2_static(&(info3->uni_profile_path)), PDB_CHANGED)) {
-               pdb_free_sam(&sam_account);
+       if (!pdb_set_profile_path(sam_account,
+                                 unistr2_static(&(info3->uni_profile_path)),
+                                 PDB_CHANGED)) {
+               TALLOC_FREE(sam_account);
                return NT_STATUS_NO_MEMORY;
        }
 
-       if (!pdb_set_homedir(sam_account, unistr2_static(&(info3->uni_home_dir)), PDB_CHANGED)) {
-               pdb_free_sam(&sam_account);
+       if (!pdb_set_homedir(sam_account,
+                            unistr2_static(&(info3->uni_home_dir)),
+                            PDB_CHANGED)) {
+               TALLOC_FREE(sam_account);
                return NT_STATUS_NO_MEMORY;
        }
 
-       if (!pdb_set_dir_drive(sam_account, unistr2_static(&(info3->uni_dir_drive)), PDB_CHANGED)) {
-               pdb_free_sam(&sam_account);
+       if (!pdb_set_dir_drive(sam_account,
+                              unistr2_static(&(info3->uni_dir_drive)),
+                              PDB_CHANGED)) {
+               TALLOC_FREE(sam_account);
                return NT_STATUS_NO_MEMORY;
        }
 
-       if (!NT_STATUS_IS_OK(nt_status = make_server_info(server_info))) {
+       if (!pdb_set_acct_ctrl(sam_account, info3->acct_flags, 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"));
-               pdb_free_sam(&sam_account);
-               return nt_status;
+               TALLOC_FREE(sam_account);
+               return NT_STATUS_NO_MEMORY;
        }
 
        /* save this here to _net_sam_logon() doesn't fail (it assumes a 
-          valid SAM_ACCOUNT) */
+          valid struct samu) */
                   
-       (*server_info)->sam_account = sam_account;
-
-       (*server_info)->unix_name = smb_xstrdup(found_username);
+       result->sam_account = sam_account;
+       result->unix_name = talloc_strdup(result, found_username);
 
        /* Fill in the unix info we found on the way */
 
-       (*server_info)->sam_fill_level = SAM_FILL_ALL;
-       (*server_info)->uid = uid;
-       (*server_info)->gid = gid;
+       result->uid = uid;
+       result->gid = gid;
 
-       /* Store the user group information in the server_info 
-          returned to the caller. */
-       
-       nt_status = get_user_groups((*server_info)->unix_name,
-               uid, gid, &n_lgroupSIDs, &lgroupSIDs, &unix_groups);
-               
-       if ( !NT_STATUS_IS_OK(nt_status) ) {
-               DEBUG(4,("get_user_groups failed\n"));
-               return nt_status;
-       }
-
-       (*server_info)->groups = unix_groups;
-       (*server_info)->n_groups = n_lgroupSIDs;
-       
        /* Create a 'combined' list of all SIDs we might want in the SD */
-       
-       all_group_SIDs = malloc(sizeof(DOM_SID) * (info3->num_groups2 +info3->num_other_sids));
-       
-       if (!all_group_SIDs) {
-               DEBUG(0, ("malloc() failed for DOM_SID list!\n"));
-               SAFE_FREE(lgroupSIDs);
-               free_server_info(server_info);
-               return NT_STATUS_NO_MEMORY;
-       }
 
-#if 0  /* JERRY -- no such thing as local groups in current code */
-       /* Copy the 'local' sids */
-       memcpy(all_group_SIDs, lgroupSIDs, sizeof(DOM_SID) * n_lgroupSIDs);
-       SAFE_FREE(lgroupSIDs);
-#endif
+       result->num_sids = 0;
+       result->sids = NULL;
 
        /* and create (by appending rids) the 'domain' sids */
        
        for (i = 0; i < info3->num_groups2; i++) {
-       
-               sid_copy(&all_group_SIDs[i], &(info3->dom_sid.sid));
-               
-               if (!sid_append_rid(&all_group_SIDs[i], info3->gids[i].g_rid)) {
-               
-                       nt_status = NT_STATUS_INVALID_PARAMETER;
-                       
-                       DEBUG(3,("could not append additional group rid 0x%x\n",
-                               info3->gids[i].g_rid));                 
-                               
-                       SAFE_FREE(lgroupSIDs);
-                       free_server_info(server_info);
-                       
-                       return nt_status;
-                       
+               DOM_SID sid;
+               if (!sid_compose(&sid, &info3->dom_sid.sid,
+                                info3->gids[i].g_rid)) {
+                       DEBUG(3,("could not append additional group rid "
+                                "0x%x\n", info3->gids[i].g_rid));
+                       TALLOC_FREE(result);
+                       return NT_STATUS_INVALID_PARAMETER;
                }
+               add_sid_to_array(result, &sid, &result->sids,
+                                &result->num_sids);
        }
 
        /* Copy 'other' sids.  We need to do sid filtering here to
@@ -1182,31 +1768,35 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
          */
 
        for (i = 0; i < info3->num_other_sids; i++) {
-               sid_copy(&all_group_SIDs[info3->num_groups2 + i],
-                        &info3->other_sids[i].sid);
+               add_sid_to_array(result, &info3->other_sids[i].sid,
+                                &result->sids,
+                                &result->num_sids);
        }
-       
-       /* Where are the 'global' sids... */
 
-       /* can the user be guest? if yes, where is it stored? */
+       result->login_server = unistr2_tdup(result, 
+                                           &(info3->uni_logon_srv));
+
+       /* ensure we are never given NULL session keys */
        
-       nt_status = create_nt_user_token(&user_sid, &group_sid,
-               info3->num_groups2 + info3->num_other_sids,
-               all_group_SIDs, False, &token);
-               
-       if ( !NT_STATUS_IS_OK(nt_status) ) {
-               DEBUG(4,("create_nt_user_token failed\n"));
-               SAFE_FREE(all_group_SIDs);
-               free_server_info(server_info);
-               return nt_status;
+       if (memcmp(info3->user_sess_key, zeros, sizeof(zeros)) == 0) {
+               result->user_session_key = data_blob(NULL, 0);
+       } else {
+               result->user_session_key = data_blob_talloc(
+                       result, info3->user_sess_key,
+                       sizeof(info3->user_sess_key));
+       }
+
+       if (memcmp(info3->lm_sess_key, zeros, 8) == 0) {
+               result->lm_session_key = data_blob(NULL, 0);
+       } else {
+               result->lm_session_key = data_blob_talloc(
+                       result, info3->lm_sess_key,
+                       sizeof(info3->lm_sess_key));
        }
 
-       (*server_info)->ptok = token; 
+       result->was_mapped = username_was_mapped;
 
-       SAFE_FREE(all_group_SIDs);
-       
-       memcpy((*server_info)->session_key, info3->user_sess_key, sizeof((*server_info)->session_key)/* 16 */);
-       memcpy((*server_info)->first_8_lm_hash, info3->padding, 8);
+       *server_info = result;
 
        return NT_STATUS_OK;
 }
@@ -1219,42 +1809,25 @@ 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.str) {
-                       DEBUG(10,("structure was created for %s\n", (*user_info)->smb_name.str));
+               if ((*user_info)->smb_name) {
+                       DEBUG(10,("structure was created for %s\n",
+                                 (*user_info)->smb_name));
                }
-               SAFE_FREE((*user_info)->smb_name.str);
-               SAFE_FREE((*user_info)->internal_username.str);
-               SAFE_FREE((*user_info)->client_domain.str);
-               SAFE_FREE((*user_info)->domain.str);
-               SAFE_FREE((*user_info)->wksta_name.str);
+               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);
-               SAFE_FREE((*user_info)->interactive_password);
+               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);
 }
 
-/***************************************************************************
- Clear out a server_info struct that has been allocated
-***************************************************************************/
-
-void free_server_info(auth_serversupplied_info **server_info)
-{
-       DEBUG(5,("attempting to free (and zero) a server_info structure\n"));
-       if (*server_info != NULL) {
-               pdb_free_sam(&(*server_info)->sam_account);
-
-               /* call pam_end here, unless we know we are keeping it */
-               delete_nt_token( &(*server_info)->ptok );
-               SAFE_FREE((*server_info)->groups);
-               SAFE_FREE((*server_info)->unix_name);
-               ZERO_STRUCT(**server_info);
-       }
-       SAFE_FREE(*server_info);
-}
-
 /***************************************************************************
  Make an auth_methods struct
 ***************************************************************************/
@@ -1262,14 +1835,16 @@ void free_server_info(auth_serversupplied_info **server_info)
 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");
+               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");
+               smb_panic("make_auth_methods: pointer to auth_method pointer "
+                         "is NULL!\n");
        }
 
-       *auth_method = talloc(auth_context->mem_ctx, sizeof(**auth_method));
+       *auth_method = TALLOC_P(auth_context->mem_ctx, auth_methods);
        if (!*auth_method) {
                DEBUG(0,("make_auth_method: malloc failed!\n"));
                return False;
@@ -1279,73 +1854,85 @@ BOOL make_auth_methods(struct auth_context *auth_context, auth_methods **auth_me
        return True;
 }
 
-/****************************************************************************
- Delete a SID token.
-****************************************************************************/
-
-void delete_nt_token(NT_USER_TOKEN **pptoken)
-{
-    if (*pptoken) {
-           NT_USER_TOKEN *ptoken = *pptoken;
-           SAFE_FREE( ptoken->user_sids );
-           ZERO_STRUCTP(ptoken);
-    }
-    SAFE_FREE(*pptoken);
-}
-
 /****************************************************************************
  Duplicate a SID token.
 ****************************************************************************/
 
-NT_USER_TOKEN *dup_nt_token(NT_USER_TOKEN *ptoken)
+NT_USER_TOKEN *dup_nt_token(TALLOC_CTX *mem_ctx, NT_USER_TOKEN *ptoken)
 {
        NT_USER_TOKEN *token;
 
        if (!ptoken)
                return NULL;
 
-    if ((token = (NT_USER_TOKEN *)malloc( sizeof(NT_USER_TOKEN) ) ) == NULL)
-        return NULL;
+       token = TALLOC_P(mem_ctx, NT_USER_TOKEN);
+       if (token == NULL) {
+               DEBUG(0, ("talloc failed\n"));
+               return NULL;
+       }
 
-    ZERO_STRUCTP(token);
+       token->user_sids = talloc_memdup(token, ptoken->user_sids,
+                                        sizeof(DOM_SID) * ptoken->num_sids );
 
-    if ((token->user_sids = (DOM_SID *)memdup( ptoken->user_sids, sizeof(DOM_SID) * ptoken->num_sids )) == NULL) {
-        SAFE_FREE(token);
-        return NULL;
-    }
+       if ((ptoken->user_sids != NULL) && (token->user_sids == NULL)) {
+               DEBUG(0, ("talloc_memdup failed\n"));
+               TALLOC_FREE(token);
+               return NULL;
+       }
 
-    token->num_sids = ptoken->num_sids;
+       token->num_sids = ptoken->num_sids;
+       
+       /* copy the privileges; don't consider failure to be critical here */
+       
+       if ( !se_priv_copy( &token->privileges, &ptoken->privileges ) ) {
+               DEBUG(0,("dup_nt_token: Failure to copy SE_PRIV!.  "
+                        "Continuing with 0 privileges assigned.\n"));
+       }
 
        return token;
 }
 
-/**
- * Squash an NT_STATUS in line with security requirements.
- * In an attempt to avoid giving the whole game away when users
- * are authenticating, NT replaces both NT_STATUS_NO_SUCH_USER and 
- * NT_STATUS_WRONG_PASSWORD with NT_STATUS_LOGON_FAILURE in certain situations 
- * (session setups in particular).
- *
- * @param nt_status NTSTATUS input for squashing.
- * @return the 'squashed' nt_status
- **/
+/****************************************************************************
+ Check for a SID in an NT_USER_TOKEN
+****************************************************************************/
 
-NTSTATUS nt_status_squash(NTSTATUS nt_status)
+BOOL nt_token_check_sid ( const DOM_SID *sid, const NT_USER_TOKEN *token )
 {
-       if NT_STATUS_IS_OK(nt_status) {
-               return nt_status;               
-       } else if NT_STATUS_EQUAL(nt_status, NT_STATUS_NO_SUCH_USER) {
-               /* Match WinXP and don't give the game away */
-               return NT_STATUS_LOGON_FAILURE;
-               
-       } else if NT_STATUS_EQUAL(nt_status, NT_STATUS_WRONG_PASSWORD) {
-               /* Match WinXP and don't give the game away */
-               return NT_STATUS_LOGON_FAILURE;
-       } else {
-               return nt_status;
-       }  
+       int i;
+       
+       if ( !sid || !token )
+               return False;
+       
+       for ( i=0; i<token->num_sids; i++ ) {
+               if ( sid_equal( sid, &token->user_sids[i] ) )
+                       return True;
+       }
+
+       return False;
 }
 
+BOOL nt_token_check_domain_rid( NT_USER_TOKEN *token, uint32 rid ) 
+{
+       DOM_SID domain_sid;
+
+       /* if we are a domain member, the get the domain SID, else for 
+          a DC or standalone server, use our own SID */
+
+       if ( lp_server_role() == ROLE_DOMAIN_MEMBER ) {
+               if ( !secrets_fetch_domain_sid( lp_workgroup(),
+                                               &domain_sid ) ) {
+                       DEBUG(1,("nt_token_check_domain_rid: Cannot lookup "
+                                "SID for domain [%s]\n", lp_workgroup()));
+                       return False;
+               }
+       } 
+       else
+               sid_copy( &domain_sid, get_global_sam_sid() );
+
+       sid_append_rid( &domain_sid, rid );
+       
+       return nt_token_check_sid( &domain_sid, token );\
+}
 
 /**
  * Verify whether or not given domain is trusted.
@@ -1358,8 +1945,6 @@ NTSTATUS nt_status_squash(NTSTATUS nt_status)
 BOOL is_trusted_domain(const char* dom_name)
 {
        DOM_SID trustdom_sid;
-       char *pass = NULL;
-       time_t lct;
        BOOL ret;
 
        /* no trusted domains for a standalone server */
@@ -1369,20 +1954,37 @@ BOOL is_trusted_domain(const char* dom_name)
 
        /* if we are a DC, then check for a direct trust relationships */
 
-       if (lp_server_role() == ROLE_DOMAIN_BDC || lp_server_role() == ROLE_DOMAIN_PDC) {
+       if ( IS_DC ) {
                become_root();
-               ret = secrets_fetch_trusted_domain_password(dom_name, &pass, &trustdom_sid, &lct);
+               DEBUG (5,("is_trusted_domain: Checking for domain trust with "
+                         "[%s]\n", dom_name ));
+               ret = secrets_fetch_trusted_domain_password(dom_name, NULL,
+                                                           NULL, NULL);
                unbecome_root();
-               SAFE_FREE(pass);
                if (ret)
                        return True;
        }
        else {
-               /* if winbindd is not up and we are a domain member) then we need to update the
-                  trustdom_cache ourselves */
+               NSS_STATUS result;
+
+               /* If winbind is around, ask it */
+
+               result = wb_is_trusted_domain(dom_name);
+
+               if (result == NSS_STATUS_SUCCESS) {
+                       return True;
+               }
 
-               if ( !winbind_ping() )
-                       update_trustdom_cache();
+               if (result == NSS_STATUS_NOTFOUND) {
+                       /* winbind could not find the domain */
+                       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();
        }
 
        /* now the trustdom cache should be available a DC could still