Changeset 745 for trunk/server/source3/auth/auth_util.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/auth/auth_util.c (modified) (59 diffs)

trunk/server/source3/auth/auth_util.c

@@ -12 +12 @@
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -23 +23 @@
 
 #include "includes.h"
-#include "smbd/globals.h"
+#include "auth.h"
 #include "../libcli/auth/libcli_auth.h"
+#include "../lib/crypto/arcfour.h"
+#include "rpc_client/init_lsa.h"
+#include "../libcli/security/security.h"
+#include "../lib/util/util_pw.h"
+#include "lib/winbind_util.h"
+#include "passdb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH
-
-/****************************************************************************
- Ensure primary group SID is always at position 0 in a 
- auth_serversupplied_info struct.
-****************************************************************************/
-
-static void sort_sid_array_for_smbd(auth_serversupplied_info *result,
-                                const DOM_SID *pgroup_sid)
-{
-        unsigned int i;
-
-        if (!result->sids) {
-                return;
-        }
-
-        if (sid_compare(&result->sids[0], pgroup_sid)==0) {
-                return;
-        }
-
-        for (i = 1; i < result->num_sids; i++) {
-                if (sid_compare(pgroup_sid,
-                                &result->sids[i]) == 0) {
-                        sid_copy(&result->sids[i], &result->sids[0]);
-                        sid_copy(&result->sids[0], pgroup_sid);
-                        return;
-                }
-        }
-}
 
 /****************************************************************************
@@ -105 +83 @@
 
 /****************************************************************************
- Create an auth_usersupplied_data structure
-****************************************************************************/
-
-static NTSTATUS make_user_info(auth_usersupplied_info **user_info,
-                               const char *smb_name,
-                               const char *internal_username,
-                               const char *client_domain,
-                               const char *domain,
-                               const char *wksta_name,
-                               DATA_BLOB *lm_pwd, DATA_BLOB *nt_pwd,
-                               DATA_BLOB *lm_interactive_pwd, DATA_BLOB *nt_interactive_pwd,
-                               DATA_BLOB *plaintext,
-                               bool encrypted)
-{
-
-        DEBUG(5,("attempting to make a user_info for %s (%s)\n", internal_username, smb_name));
-
-        *user_info = SMB_MALLOC_P(auth_usersupplied_info);
-        if (*user_info == NULL) {
-                DEBUG(0,("malloc failed for user_info (size %lu)\n", (unsigned long)sizeof(*user_info)));
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        ZERO_STRUCTP(*user_info);
-
-        DEBUG(5,("making strings for %s's user_info struct\n", internal_username));
-
-        (*user_info)->smb_name = SMB_STRDUP(smb_name);
-        if ((*user_info)->smb_name == NULL) { 
-                free_user_info(user_info);
-                return NT_STATUS_NO_MEMORY;
-        }
-        
-        (*user_info)->internal_username = SMB_STRDUP(internal_username);
-        if ((*user_info)->internal_username == NULL) { 
-                free_user_info(user_info);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        (*user_info)->domain = SMB_STRDUP(domain);
-        if ((*user_info)->domain == NULL) { 
-                free_user_info(user_info);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        (*user_info)->client_domain = SMB_STRDUP(client_domain);
-        if ((*user_info)->client_domain == NULL) { 
-                free_user_info(user_info);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        (*user_info)->wksta_name = SMB_STRDUP(wksta_name);
-        if ((*user_info)->wksta_name == NULL) { 
-                free_user_info(user_info);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        DEBUG(5,("making blobs for %s's user_info struct\n", internal_username));
-
-        if (lm_pwd)
-                (*user_info)->lm_resp = data_blob(lm_pwd->data, lm_pwd->length);
-        if (nt_pwd)
-                (*user_info)->nt_resp = data_blob(nt_pwd->data, nt_pwd->length);
-        if (lm_interactive_pwd)
-                (*user_info)->lm_interactive_pwd = data_blob(lm_interactive_pwd->data, lm_interactive_pwd->length);
-        if (nt_interactive_pwd)
-                (*user_info)->nt_interactive_pwd = data_blob(nt_interactive_pwd->data, nt_interactive_pwd->length);
-
-        if (plaintext)
-                (*user_info)->plaintext_password = data_blob(plaintext->data, plaintext->length);
-
-        (*user_info)->encrypted = encrypted;
-
-        (*user_info)->logon_parameters = 0;
-
-        DEBUG(10,("made an %sencrypted user_info for %s (%s)\n", encrypted ? "":"un" , internal_username, smb_name));
-
-        return NT_STATUS_OK;
-}
-
-/****************************************************************************
  Create an auth_usersupplied_data structure after appropriate mapping.
 ****************************************************************************/
 
-NTSTATUS make_user_info_map(auth_usersupplied_info **user_info,
+NTSTATUS make_user_info_map(struct auth_usersupplied_info **user_info,
                             const char *smb_name,
                             const char *client_domain,
-                            const char *wksta_name,
+                            const char *workstation_name,
                             DATA_BLOB *lm_pwd,
                             DATA_BLOB *nt_pwd,
-                            DATA_BLOB *lm_interactive_pwd,
-                            DATA_BLOB *nt_interactive_pwd,
-                            DATA_BLOB *plaintext,
-                            bool encrypted)
-{
-        struct smbd_server_connection *sconn = smbd_server_conn;
+                            const struct samr_Password *lm_interactive_pwd,
+                            const struct samr_Password *nt_interactive_pwd,
+                            const char *plaintext,
+                            enum auth_password_state password_state)
+{
         const char *domain;
         NTSTATUS result;
         bool was_mapped;
-        fstring internal_username;
-        fstrcpy(internal_username, smb_name);
-        was_mapped = map_username(sconn, internal_username);
+        char *internal_username = NULL;
+
+        was_mapped = map_username(talloc_tos(), smb_name, &internal_username);
+        if (!internal_username) {
+                return NT_STATUS_NO_MEMORY;
+        }
 
         DEBUG(5, ("Mapping user [%s]\\[%s] from workstation [%s]\n",
-                 client_domain, smb_name, wksta_name));
+                 client_domain, smb_name, workstation_name));
 
         domain = client_domain;
@@ -230 +129 @@
                 DEBUG(5, ("Mapped domain from [%s] to [%s] for user [%s] from "
                           "workstation [%s]\n",
-                          client_domain, domain, smb_name, wksta_name));
+                          client_domain, domain, smb_name, workstation_name));
         }
 
@@ -238 +137 @@
 
         result = make_user_info(user_info, smb_name, internal_username,
-                              client_domain, domain, wksta_name,
+                              client_domain, domain, workstation_name,
                               lm_pwd, nt_pwd,
                               lm_interactive_pwd, nt_interactive_pwd,
-                              plaintext, encrypted);
+                              plaintext, password_state);
         if (NT_STATUS_IS_OK(result)) {
+                /* We have tried mapping */
+                (*user_info)->mapped_state = True;
+                /* did we actually map the user to a different name? */
                 (*user_info)->was_mapped = was_mapped;
         }
@@ -253 +155 @@
 ****************************************************************************/
 
-bool make_user_info_netlogon_network(auth_usersupplied_info **user_info, 
+bool make_user_info_netlogon_network(struct auth_usersupplied_info **user_info,
                                      const char *smb_name, 
                                      const char *client_domain, 
-                                     const char *wksta_name, 
+                                     const char *workstation_name,
                                      uint32 logon_parameters,
                                      const uchar *lm_network_pwd,
@@ -270 +172 @@
         status = make_user_info_map(user_info,
                                     smb_name, client_domain, 
-                                    wksta_name, 
+                                    workstation_name,
                                     lm_pwd_len ? &lm_blob : NULL, 
                                     nt_pwd_len ? &nt_blob : NULL,
                                     NULL, NULL, NULL,
-                                    True);
+                                    AUTH_PASSWORD_RESPONSE);
 
         if (NT_STATUS_IS_OK(status)) {
@@ -291 +193 @@
 ****************************************************************************/
 
-bool make_user_info_netlogon_interactive(auth_usersupplied_info **user_info, 
+bool make_user_info_netlogon_interactive(struct auth_usersupplied_info **user_info,
                                          const char *smb_name, 
                                          const char *client_domain, 
-                                         const char *wksta_name, 
+                                         const char *workstation_name,
                                          uint32 logon_parameters,
                                          const uchar chal[8], 
@@ -301 +203 @@
                                          const uchar *dc_sess_key)
 {
-        unsigned char lm_pwd[16];
-        unsigned char nt_pwd[16];
+        struct samr_Password lm_pwd;
+        struct samr_Password nt_pwd;
         unsigned char local_lm_response[24];
         unsigned char local_nt_response[24];
         unsigned char key[16];
-        
+
         memcpy(key, dc_sess_key, 16);
-        
+
         if (lm_interactive_pwd)
-                memcpy(lm_pwd, lm_interactive_pwd, sizeof(lm_pwd));
+                memcpy(lm_pwd.hash, lm_interactive_pwd, sizeof(lm_pwd.hash));
 
         if (nt_interactive_pwd)
-                memcpy(nt_pwd, nt_interactive_pwd, sizeof(nt_pwd));
-        
+                memcpy(nt_pwd.hash, nt_interactive_pwd, sizeof(nt_pwd.hash));
+
 #ifdef DEBUG_PASSWORD
         DEBUG(100,("key:"));
         dump_data(100, key, sizeof(key));
-        
+
         DEBUG(100,("lm owf password:"));
-        dump_data(100, lm_pwd, sizeof(lm_pwd));
-        
+        dump_data(100, lm_pwd.hash, sizeof(lm_pwd.hash));
+
         DEBUG(100,("nt owf password:"));
-        dump_data(100, nt_pwd, sizeof(nt_pwd));
+        dump_data(100, nt_pwd.hash, sizeof(nt_pwd.hash));
 #endif
-        
+
         if (lm_interactive_pwd)
-                arcfour_crypt(lm_pwd, key, sizeof(lm_pwd));
-        
+                arcfour_crypt(lm_pwd.hash, key, sizeof(lm_pwd.hash));
+
         if (nt_interactive_pwd)
-                arcfour_crypt(nt_pwd, key, sizeof(nt_pwd));
-        
+                arcfour_crypt(nt_pwd.hash, key, sizeof(nt_pwd.hash));
+
 #ifdef DEBUG_PASSWORD
         DEBUG(100,("decrypt of lm owf password:"));
-        dump_data(100, lm_pwd, sizeof(lm_pwd));
-        
+        dump_data(100, lm_pwd.hash, sizeof(lm_pwd));
+
         DEBUG(100,("decrypt of nt owf password:"));
-        dump_data(100, nt_pwd, sizeof(nt_pwd));
+        dump_data(100, nt_pwd.hash, sizeof(nt_pwd));
 #endif
-        
+
         if (lm_interactive_pwd)
-                SMBOWFencrypt(lm_pwd, chal,
+                SMBOWFencrypt(lm_pwd.hash, chal,
                               local_lm_response);
 
         if (nt_interactive_pwd)
-                SMBOWFencrypt(nt_pwd, chal,
+                SMBOWFencrypt(nt_pwd.hash, chal,
                               local_nt_response);
-        
+
         /* Password info paranoia */
         ZERO_STRUCT(key);
@@ -357 +259 @@
                 DATA_BLOB local_nt_blob;
 
-                DATA_BLOB lm_interactive_blob;
-                DATA_BLOB nt_interactive_blob;
-                
                 if (lm_interactive_pwd) {
                         local_lm_blob = data_blob(local_lm_response,
                                                   sizeof(local_lm_response));
-                        lm_interactive_blob = data_blob(lm_pwd,
-                                                        sizeof(lm_pwd));
-                        ZERO_STRUCT(lm_pwd);
                 }
-                
+
                 if (nt_interactive_pwd) {
                         local_nt_blob = data_blob(local_nt_response,
                                                   sizeof(local_nt_response));
-                        nt_interactive_blob = data_blob(nt_pwd,
-                                                        sizeof(nt_pwd));
-                        ZERO_STRUCT(nt_pwd);
                 }
 
                 nt_status = make_user_info_map(
                         user_info, 
-                        smb_name, client_domain, wksta_name, 
+                        smb_name, client_domain, workstation_name,
                         lm_interactive_pwd ? &local_lm_blob : NULL,
                         nt_interactive_pwd ? &local_nt_blob : NULL,
-                        lm_interactive_pwd ? &lm_interactive_blob : NULL,
-                        nt_interactive_pwd ? &nt_interactive_blob : NULL,
-                        NULL, True);
+                        lm_interactive_pwd ? &lm_pwd : NULL,
+                        nt_interactive_pwd ? &nt_pwd : NULL,
+                        NULL, AUTH_PASSWORD_HASH);
 
                 if (NT_STATUS_IS_OK(nt_status)) {
@@ -392 +285 @@
                 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;
         }
@@ -403 +294 @@
 ****************************************************************************/
 
-bool make_user_info_for_reply(auth_usersupplied_info **user_info, 
+bool make_user_info_for_reply(struct auth_usersupplied_info **user_info,
                               const char *smb_name, 
                               const char *client_domain,
@@ -413 +304 @@
         DATA_BLOB local_nt_blob;
         NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
-                        
+        char *plaintext_password_string;
         /*
          * Not encrypted - do so.
          */
-        
+
         DEBUG(5,("make_user_info_for_reply: User passwords not in encrypted "
                  "format.\n"));
-        
-        if (plaintext_password.data) {
+        if (plaintext_password.data && plaintext_password.length) {
                 unsigned char local_lm_response[24];
-                
+
 #ifdef DEBUG_PASSWORD
                 DEBUG(10,("Unencrypted password (len %d):\n",
@@ -434 +324 @@
                             (const uchar*)chal, local_lm_response);
                 local_lm_blob = data_blob(local_lm_response, 24);
-                
+
                 /* We can't do an NT hash here, as the password needs to be
                    case insensitive */
                 local_nt_blob = data_blob_null; 
-                
         } else {
                 local_lm_blob = data_blob_null; 
                 local_nt_blob = data_blob_null; 
         }
-        
+
+        plaintext_password_string = talloc_strndup(talloc_tos(),
+                                                   (const char *)plaintext_password.data,
+                                                   plaintext_password.length);
+        if (!plaintext_password_string) {
+                return False;
+        }
+
         ret = make_user_info_map(
                 user_info, smb_name, client_domain, 
@@ -450 +346 @@
                 local_nt_blob.data ? &local_nt_blob : NULL,
                 NULL, NULL,
-                plaintext_password.data ? &plaintext_password : NULL, 
-                False);
-        
+                plaintext_password_string,
+                AUTH_PASSWORD_PLAIN);
+
+        if (plaintext_password_string) {
+                memset(plaintext_password_string, '\0', strlen(plaintext_password_string));
+                talloc_free(plaintext_password_string);
+        }
+
         data_blob_free(&local_lm_blob);
         return NT_STATUS_IS_OK(ret) ? True : False;
@@ -461 +362 @@
 ****************************************************************************/
 
-NTSTATUS make_user_info_for_reply_enc(auth_usersupplied_info **user_info, 
+NTSTATUS make_user_info_for_reply_enc(struct auth_usersupplied_info **user_info,
                                       const char *smb_name,
                                       const char *client_domain, 
@@ -472 +373 @@
                                   nt_resp.data && (nt_resp.length > 0) ? &nt_resp : NULL,
                                   NULL, NULL, NULL,
-                                  True);
+                                  AUTH_PASSWORD_RESPONSE);
 }
 
@@ -479 +380 @@
 ****************************************************************************/
 
-bool make_user_info_guest(auth_usersupplied_info **user_info) 
+bool make_user_info_guest(struct auth_usersupplied_info **user_info)
 {
         NTSTATUS nt_status;
@@ -490 +391 @@
                                    NULL, NULL, 
                                    NULL,
-                                   True);
-                              
+                                   AUTH_PASSWORD_RESPONSE);
+
         return NT_STATUS_IS_OK(nt_status) ? True : False;
 }
 
-static int server_info_dtor(auth_serversupplied_info *server_info)
-{
-        TALLOC_FREE(server_info->sam_account);
-        ZERO_STRUCTP(server_info);
-        return 0;
-}
-
-/***************************************************************************
- Make a server_info struct. Free with TALLOC_FREE().
-***************************************************************************/
-
-static auth_serversupplied_info *make_server_info(TALLOC_CTX *mem_ctx)
-{
-        struct auth_serversupplied_info *result;
-
-        result = TALLOC_ZERO_P(mem_ctx, auth_serversupplied_info);
-        if (result == NULL) {
-                DEBUG(0, ("talloc failed\n"));
-                return NULL;
-        }
-
-        talloc_set_destructor(result, server_info_dtor);
-
-        /* Initialise the uid and gid values to something non-zero
-           which may save us from giving away root access if there
-           is a bug in allocating these fields. */
-
-        result->utok.uid = -1;
-        result->utok.gid = -1;
-        return result;
-}
-
-static char *sanitize_username(TALLOC_CTX *mem_ctx, const char *username)
-{
-        fstring tmp;
-
-        alpha_strcpy(tmp, username, ". _-$", sizeof(tmp));
-        return talloc_strdup(mem_ctx, tmp);
-}
-
-/***************************************************************************
- Is the incoming username our own machine account ?
- If so, the connection is almost certainly from winbindd.
-***************************************************************************/
-
-static bool is_our_machine_account(const char *username)
-{
-        bool ret;
-        char *truncname = NULL;
-        size_t ulen = strlen(username);
-
-        if (ulen == 0 || username[ulen-1] != '$') {
-                return false;
-        }
-        truncname = SMB_STRDUP(username);
-        if (!truncname) {
-                return false;
-        }
-        truncname[ulen-1] = '\0';
-        ret = strequal(truncname, global_myname());
-        SAFE_FREE(truncname);
-        return ret;
-}
-
-/***************************************************************************
- Make (and fill) a user_info struct from a struct samu
-***************************************************************************/
-
-NTSTATUS make_server_info_sam(auth_serversupplied_info **server_info,
-                              struct samu *sampass)
-{
-        struct passwd *pwd;
-        gid_t *gids;
-        auth_serversupplied_info *result;
-        const char *username = pdb_get_username(sampass);
-        NTSTATUS status;
-
-        if ( !(result = make_server_info(NULL)) ) {
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        if ( !(pwd = Get_Pwnam_alloc(result, username)) ) {
-                DEBUG(1, ("User %s in passdb, but getpwnam() fails!\n",
-                          pdb_get_username(sampass)));
-                TALLOC_FREE(result);
-                return NT_STATUS_NO_SUCH_USER;
-        }
-
-        result->sam_account = sampass;
-        result->unix_name = pwd->pw_name;
-        /* Ensure that we keep pwd->pw_name, because we will free pwd below */
-        talloc_steal(result, pwd->pw_name);
-        result->utok.gid = pwd->pw_gid;
-        result->utok.uid = pwd->pw_uid;
-
-        TALLOC_FREE(pwd);
-
-        result->sanitized_username = sanitize_username(result,
-                                                       result->unix_name);
-        if (result->sanitized_username == NULL) {
-                TALLOC_FREE(result);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        if (IS_DC && is_our_machine_account(username)) {
-                /*
-                 * Ensure for a connection from our own
-                 * machine account (from winbindd on a DC)
-                 * there are no supplementary groups.
-                 * Prevents loops in calling gid_to_sid().
-                 */
-                result->sids = NULL;
-                gids = NULL;
-                result->num_sids = 0;
-
-                /*
-                 * This is a hack of monstrous proportions.
-                 * If we know it's winbindd talking to us,
-                 * we know we must never recurse into it,
-                 * so turn off contacting winbindd for this
-                 * entire process. This will get fixed when
-                 * winbindd doesn't need to talk to smbd on
-                 * a PDC. JRA.
-                 */
-
-                (void)winbind_off();
-
-                DEBUG(10, ("make_server_info_sam: our machine account %s "
-                        "setting supplementary group list empty and "
-                        "turning off winbindd requests.\n",
-                        username));
-        } else {
-                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;
-                }
-        }
-
-        /* For now we throw away the gids and convert via sid_to_gid
-         * later. This needs fixing, but I'd like to get the code straight and
-         * simple first. */
-         
-        TALLOC_FREE(gids);
-
-        DEBUG(5,("make_server_info_sam: made server info for user %s -> %s\n",
-                 pdb_get_username(sampass), result->unix_name));
-
-        *server_info = result;
-        /* Ensure that the sampass will be freed with the result */
-        talloc_steal(result, sampass);
-
-        return NT_STATUS_OK;
-}
-
-static NTSTATUS log_nt_token(NT_USER_TOKEN *token)
+static NTSTATUS log_nt_token(struct security_token *token)
 {
         TALLOC_CTX *frame = talloc_stackframe();
@@ -673 +413 @@
                 group_sidstr = talloc_asprintf(
                         frame, "%s %s", group_sidstr,
-                        sid_string_talloc(frame, &token->user_sids[i]));
+                        sid_string_talloc(frame, &token->sids[i]));
         }
 
         command = talloc_string_sub(
                 frame, lp_log_nt_token_command(),
-                "%s", sid_string_talloc(frame, &token->user_sids[0]));
+                "%s", sid_string_talloc(frame, &token->sids[0]));
         command = talloc_string_sub(frame, command, "%t", group_sidstr);
 
@@ -698 +438 @@
 
 /*
- * Create the token to use from server_info->sam_account and
+ * Create the token to use from server_info->info3 and
  * server_info->sids (the info3/sam groups). Find the unix gids.
  */
 
-NTSTATUS create_local_token(auth_serversupplied_info *server_info)
-{
+NTSTATUS create_local_token(struct auth_serversupplied_info *server_info)
+{
+        struct security_token *t;
         NTSTATUS status;
         size_t i;
         struct dom_sid tmp_sid;
+        struct wbcUnixId *ids;
 
         /*
@@ -722 +464 @@
                                                     &server_info->utok.gid,
                                                     &server_info->unix_name,
-                                                    &server_info->ptok);
+                                                    &server_info->security_token);
 
         } else {
-                server_info->ptok = create_local_nt_token(
-                        server_info,
-                        pdb_get_user_sid(server_info->sam_account),
-                        server_info->guest,
-                        server_info->num_sids, server_info->sids);
-                status = server_info->ptok ?
-                        NT_STATUS_OK : NT_STATUS_NO_SUCH_USER;
+                status = create_local_nt_token_from_info3(server_info,
+                                                          server_info->guest,
+                                                          server_info->info3,
+                                                          &server_info->extra,
+                                                          &server_info->security_token);
         }
 
@@ -743 +483 @@
         server_info->utok.groups = NULL;
 
+        t = server_info->security_token;
+
+        ids = TALLOC_ARRAY(talloc_tos(), struct wbcUnixId,
+                           t->num_sids);
+        if (ids == NULL) {
+                return NT_STATUS_NO_MEMORY;
+        }
+
+        if (!sids_to_unix_ids(t->sids, t->num_sids, ids)) {
+                TALLOC_FREE(ids);
+                return NT_STATUS_NO_MEMORY;
+        }
+
         /* Start at index 1, where the groups start. */
 
-        for (i=1; i<server_info->ptok->num_sids; i++) {
-                gid_t gid;
-                DOM_SID *sid = &server_info->ptok->user_sids[i];
-
-                if (!sid_to_gid(sid, &gid)) {
+        for (i=1; i<t->num_sids; i++) {
+
+                if (ids[i].type != WBC_ID_TYPE_GID) {
                         DEBUG(10, ("Could not convert SID %s to gid, "
-                                   "ignoring it\n", sid_string_dbg(sid)));
+                                   "ignoring it\n",
+                                   sid_string_dbg(&t->sids[i])));
                         continue;
                 }
-                add_gid_to_array_unique(server_info, gid,
-                                        &server_info->utok.groups,
-                                        &server_info->utok.ngroups);
+                if (!add_gid_to_array_unique(server_info, ids[i].id.gid,
+                                             &server_info->utok.groups,
+                                             &server_info->utok.ngroups)) {
+                        return NT_STATUS_NO_MEMORY;
+                }
         }
 
@@ -772 +526 @@
          */
 
-        if (!uid_to_unix_users_sid(server_info->utok.uid, &tmp_sid)) {
-                DEBUG(1,("create_local_token: Failed to create SID "
-                        "for uid %u!\n", (unsigned int)server_info->utok.uid));
-        }
-        add_sid_to_array_unique(server_info->ptok, &tmp_sid,
-                                &server_info->ptok->user_sids,
-                                &server_info->ptok->num_sids);
+        uid_to_unix_users_sid(server_info->utok.uid, &tmp_sid);
+
+        add_sid_to_array_unique(server_info->security_token, &tmp_sid,
+                                &server_info->security_token->sids,
+                                &server_info->security_token->num_sids);
 
         for ( i=0; i<server_info->utok.ngroups; i++ ) {
-                if (!gid_to_unix_groups_sid( server_info->utok.groups[i], &tmp_sid ) ) {
-                        DEBUG(1,("create_local_token: Failed to create SID "
-                                "for gid %u!\n", (unsigned int)server_info->utok.groups[i]));
-                        continue;
-                }
-                add_sid_to_array_unique(server_info->ptok, &tmp_sid,
-                                        &server_info->ptok->user_sids,
-                                        &server_info->ptok->num_sids);
-        }
-
-        debug_nt_user_token(DBGC_AUTH, 10, server_info->ptok);
+                gid_to_unix_groups_sid(server_info->utok.groups[i], &tmp_sid);
+                add_sid_to_array_unique(server_info->security_token, &tmp_sid,
+                                        &server_info->security_token->sids,
+                                        &server_info->security_token->num_sids);
+        }
+
+        security_token_debug(DBGC_AUTH, 10, server_info->security_token);
         debug_unix_user_token(DBGC_AUTH, 10,
                               server_info->utok.uid,
@@ -798 +546 @@
                               server_info->utok.groups);
 
-        status = log_nt_token(server_info->ptok);
+        status = log_nt_token(server_info->security_token);
         return status;
-}
-
-/*
- * Create an artificial NT token given just a username. (Initially intended
- * for force user)
- *
- * We go through lookup_name() to avoid problems we had with 'winbind use
- * default domain'.
- *
- * We have 3 cases:
- *
- * unmapped unix users: Go directly to nss to find the user's group.
- *
- * A passdb user: The list of groups is provided by pdb_enum_group_memberships.
- *
- * If the user is provided by winbind, the primary gid is set to "domain
- * users" of the user's domain. For an explanation why this is necessary, see
- * the thread starting at
- * http://lists.samba.org/archive/samba-technical/2006-January/044803.html.
- */
-
-NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
-                                    bool is_guest,
-                                    uid_t *uid, gid_t *gid,
-                                    char **found_username,
-                                    struct nt_user_token **token)
-{
-        NTSTATUS result = NT_STATUS_NO_SUCH_USER;
-        TALLOC_CTX *tmp_ctx;
-        DOM_SID user_sid;
-        enum lsa_SidType type;
-        gid_t *gids;
-        DOM_SID *group_sids;
-        DOM_SID unix_group_sid;
-        size_t num_group_sids;
-        size_t num_gids;
-        size_t i;
-
-        tmp_ctx = talloc_new(NULL);
-        if (tmp_ctx == NULL) {
-                DEBUG(0, ("talloc_new failed\n"));
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        if (!lookup_name_smbconf(tmp_ctx, username, LOOKUP_NAME_ALL,
-                         NULL, NULL, &user_sid, &type)) {
-                DEBUG(1, ("lookup_name_smbconf for %s failed\n", username));
-                goto done;
-        }
-
-        if (type != SID_NAME_USER) {
-                DEBUG(1, ("%s is a %s, not a user\n", username,
-                          sid_type_lookup(type)));
-                goto done;
-        }
-
-        if (sid_check_is_in_our_domain(&user_sid)) {
-                bool ret;
-
-                /* This is a passdb user, so ask passdb */
-
-                struct samu *sam_acct = NULL;
-
-                if ( !(sam_acct = samu_new( tmp_ctx )) ) {
-                        result = NT_STATUS_NO_MEMORY;
-                        goto done;
-                }
-
-                become_root();
-                ret = pdb_getsampwsid(sam_acct, &user_sid);
-                unbecome_root();
-
-                if (!ret) {
-                        DEBUG(1, ("pdb_getsampwsid(%s) for user %s failed\n",
-                                  sid_string_dbg(&user_sid), username));
-                        DEBUGADD(1, ("Fall back to unix user %s\n", username));
-                        goto unix_user;
-                }
-
-                result = pdb_enum_group_memberships(tmp_ctx, sam_acct,
-                                                    &group_sids, &gids,
-                                                    &num_group_sids);
-                if (!NT_STATUS_IS_OK(result)) {
-                        DEBUG(1, ("enum_group_memberships failed for %s (%s): "
-                                  "%s\n", username, sid_string_dbg(&user_sid),
-                                  nt_errstr(result)));
-                        DEBUGADD(1, ("Fall back to unix user %s\n", username));
-                        goto unix_user;
-                }
-
-                /* see the smb_panic() in pdb_default_enum_group_memberships */
-                SMB_ASSERT(num_group_sids > 0); 
-
-                *gid = gids[0];
-
-                /* Ensure we're returning the found_username on the right context. */
-                *found_username = talloc_strdup(mem_ctx,
-                                                pdb_get_username(sam_acct));
-
-                /*
-                 * If the SID from lookup_name() was the guest sid, passdb knows
-                 * about the mapping of guest sid to lp_guestaccount()
-                 * username and will return the unix_pw info for a guest
-                 * user. Use it if it's there, else lookup the *uid details
-                 * using Get_Pwnam_alloc(). See bug #6291 for details. JRA.
-                 */
-
-                /* We must always assign the *uid. */
-                if (sam_acct->unix_pw == NULL) {
-                        struct passwd *pwd = Get_Pwnam_alloc(sam_acct, *found_username );
-                        if (!pwd) {
-                                DEBUG(10, ("Get_Pwnam_alloc failed for %s\n",
-                                        *found_username));
-                                result = NT_STATUS_NO_SUCH_USER;
-                                goto done;
-                        }
-                        result = samu_set_unix(sam_acct, pwd );
-                        if (!NT_STATUS_IS_OK(result)) {
-                                DEBUG(10, ("samu_set_unix failed for %s\n",
-                                        *found_username));
-                                result = NT_STATUS_NO_SUCH_USER;
-                                goto done;
-                        }
-                }
-                *uid = sam_acct->unix_pw->pw_uid;
-
-        } else  if (sid_check_is_in_unix_users(&user_sid)) {
-
-                /* This is a unix user not in passdb. We need to ask nss
-                 * directly, without consulting passdb */
-
-                struct passwd *pass;
-
-                /*
-                 * This goto target is used as a fallback for the passdb
-                 * case. The concrete bug report is when passdb gave us an
-                 * unmapped gid.
-                 */
-
-        unix_user:
-
-                if (!sid_to_uid(&user_sid, uid)) {
-                        DEBUG(1, ("unix_user case, sid_to_uid for %s (%s) failed\n",
-                                  username, sid_string_dbg(&user_sid)));
-                        result = NT_STATUS_NO_SUCH_USER;
-                        goto done;
-                }
-
-                uid_to_unix_users_sid(*uid, &user_sid);
-
-                pass = getpwuid_alloc(tmp_ctx, *uid);
-                if (pass == NULL) {
-                        DEBUG(1, ("getpwuid(%u) for user %s failed\n",
-                                  (unsigned int)*uid, username));
-                        goto done;
-                }
-
-                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;
-                }
-
-                if (num_group_sids) {
-                        group_sids = TALLOC_ARRAY(tmp_ctx, DOM_SID, num_group_sids);
-                        if (group_sids == NULL) {
-                                DEBUG(1, ("TALLOC_ARRAY failed\n"));
-                                result = NT_STATUS_NO_MEMORY;
-                                goto done;
-                        }
-                } else {
-                        group_sids = NULL;
-                }
-
-                for (i=0; i<num_group_sids; i++) {
-                        gid_to_sid(&group_sids[i], gids[i]);
-                }
-
-                /* In getgroups_unix_user we always set the primary gid */
-                SMB_ASSERT(num_group_sids > 0); 
-
-                *gid = gids[0];
-
-                /* Ensure we're returning the found_username on the right context. */
-                *found_username = talloc_strdup(mem_ctx, pass->pw_name);
-        } 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;
-
-                /* We must always assign the *uid. */
-                if (!sid_to_uid(&user_sid, uid)) {
-                        DEBUG(1, ("winbindd case, sid_to_uid for %s (%s) failed\n",
-                                  username, sid_string_dbg(&user_sid)));
-                        result = NT_STATUS_NO_SUCH_USER;
-                        goto done;
-                }
-
-                num_group_sids = 1;
-                group_sids = TALLOC_ARRAY(tmp_ctx, DOM_SID, num_group_sids);
-                if (group_sids == NULL) {
-                        DEBUG(1, ("TALLOC_ARRAY failed\n"));
-                        result = NT_STATUS_NO_MEMORY;
-                        goto done;
-                }
-
-                sid_copy(&group_sids[0], &user_sid);
-                sid_split_rid(&group_sids[0], &dummy);
-                sid_append_rid(&group_sids[0], DOMAIN_GROUP_RID_USERS);
-
-                if (!sid_to_gid(&group_sids[0], gid)) {
-                        DEBUG(1, ("sid_to_gid(%s) failed\n",
-                                  sid_string_dbg(&group_sids[0])));
-                        goto done;
-                }
-
-                gids = gid;
-
-                /* Ensure we're returning the found_username on the right context. */
-                *found_username = talloc_strdup(mem_ctx, username);
-        }
-
-        /* Add the "Unix Group" SID for each gid to catch mapped groups
-           and their Unix equivalent.  This is to solve the backwards
-           compatibility problem of 'valid users = +ntadmin' where
-           ntadmin has been paired with "Domain Admins" in the group
-           mapping table.  Otherwise smb.conf would need to be changed
-           to 'valid user = "Domain Admins"'.  --jerry */
-
-        num_gids = num_group_sids;
-        for ( i=0; i<num_gids; i++ ) {
-                gid_t high, low;
-
-                /* don't pickup anything managed by Winbind */
-
-                if ( lp_idmap_gid(&low, &high) && (gids[i] >= low) && (gids[i] <= high) )
-                        continue;
-
-                if ( !gid_to_unix_groups_sid( gids[i], &unix_group_sid ) ) {
-                        DEBUG(1,("create_token_from_username: Failed to create SID "
-                                "for gid %u!\n", (unsigned int)gids[i]));
-                        continue;
-                }
-                result = add_sid_to_array_unique(tmp_ctx, &unix_group_sid,
-                                                 &group_sids, &num_group_sids);
-                if (!NT_STATUS_IS_OK(result)) {
-                        goto done;
-                }
-        }
-
-        /* Ensure we're creating the nt_token on the right context. */
-        *token = create_local_nt_token(mem_ctx, &user_sid,
-                                       is_guest, num_group_sids, group_sids);
-
-        if ((*token == NULL) || (*found_username == NULL)) {
-                result = NT_STATUS_NO_MEMORY;
-                goto done;
-        }
-
-        result = NT_STATUS_OK;
- done:
-        TALLOC_FREE(tmp_ctx);
-        return result;
-}
-
-/***************************************************************************
- Build upon create_token_from_username:
-
- Expensive helper function to figure out whether a user given its name is
- member of a particular group.
-***************************************************************************/
-
-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);
 }
 
@@ -1141 +555 @@
 ***************************************************************************/
 
-NTSTATUS make_server_info_pw(auth_serversupplied_info **server_info, 
+NTSTATUS make_server_info_pw(struct auth_serversupplied_info **server_info,
                              char *unix_username,
                              struct passwd *pwd)
@@ -1147 +561 @@
         NTSTATUS status;
         struct samu *sampass = NULL;
-        gid_t *gids;
         char *qualified_name = NULL;
         TALLOC_CTX *mem_ctx = NULL;
-        DOM_SID u_sid;
+        struct dom_sid u_sid;
         enum lsa_SidType type;
-        auth_serversupplied_info *result;
-        
-        if ( !(sampass = samu_new( NULL )) ) {
-                return NT_STATUS_NO_MEMORY;
-        }
-        
-        status = samu_set_unix( sampass, pwd );
-        if (!NT_STATUS_IS_OK(status)) {
-                return status;
-        }
-
-        result = make_server_info(NULL);
-        if (result == NULL) {
-                TALLOC_FREE(sampass);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        result->sam_account = sampass;
-
-        result->unix_name = talloc_strdup(result, unix_username);
-        result->sanitized_username = sanitize_username(result, unix_username);
-
-        if ((result->unix_name == NULL)
-            || (result->sanitized_username == NULL)) {
-                TALLOC_FREE(sampass);
-                TALLOC_FREE(result);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        result->utok.uid = pwd->pw_uid;
-        result->utok.gid = pwd->pw_gid;
-
-        status = pdb_enum_group_memberships(result, sampass,
-                                            &result->sids, &gids,
-                                            &result->num_sids);
-
-        if (!NT_STATUS_IS_OK(status)) {
-                DEBUG(10, ("pdb_enum_group_memberships failed: %s\n",
-                           nt_errstr(status)));
-                TALLOC_FREE(result);
-                return status;
-        }
+        struct auth_serversupplied_info *result;
 
         /*
@@ -1210 +582 @@
         mem_ctx = talloc_init("make_server_info_pw_tmp");
         if (!mem_ctx) {
-                TALLOC_FREE(result);
                 return NT_STATUS_NO_MEMORY;
         }
@@ -1218 +589 @@
                                         unix_username );
         if (!qualified_name) {
-                TALLOC_FREE(result);
                 TALLOC_FREE(mem_ctx);
                 return NT_STATUS_NO_MEMORY;
@@ -1226 +596 @@
                                                 NULL, NULL,
                                                 &u_sid, &type)) {
-                TALLOC_FREE(result);
                 TALLOC_FREE(mem_ctx);
                 return NT_STATUS_NO_SUCH_USER;
@@ -1234 +603 @@
 
         if (type != SID_NAME_USER) {
-                TALLOC_FREE(result);
                 return NT_STATUS_NO_SUCH_USER;
         }
 
-        status = add_sid_to_array_unique(result, &u_sid,
-                                         &result->sids,
-                                         &result->num_sids);
+        if ( !(sampass = samu_new( NULL )) ) {
+                return NT_STATUS_NO_MEMORY;
+        }
+
+        status = samu_set_unix( sampass, pwd );
         if (!NT_STATUS_IS_OK(status)) {
+                return status;
+        }
+
+        /* In pathological cases the above call can set the account
+         * name to the DOMAIN\username form. Reset the account name
+         * using unix_username */
+        pdb_set_username(sampass, unix_username, PDB_SET);
+
+        /* set the user sid to be the calculated u_sid */
+        pdb_set_user_sid(sampass, &u_sid, PDB_SET);
+
+        result = make_server_info(NULL);
+        if (result == NULL) {
+                TALLOC_FREE(sampass);
+                return NT_STATUS_NO_MEMORY;
+        }
+
+        status = samu_to_SamInfo3(result, sampass, global_myname(),
+                                  &result->info3, &result->extra);
+        TALLOC_FREE(sampass);
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(10, ("Failed to convert samu to info3: %s\n",
+                           nt_errstr(status)));
                 TALLOC_FREE(result);
                 return status;
         }
 
-        /* For now we throw away the gids and convert via sid_to_gid
-         * later. This needs fixing, but I'd like to get the code straight and
-         * simple first. */
-        TALLOC_FREE(gids);
+        result->unix_name = talloc_strdup(result, unix_username);
+        result->sanitized_username = sanitize_username(result, unix_username);
+
+        if ((result->unix_name == NULL)
+            || (result->sanitized_username == NULL)) {
+                TALLOC_FREE(result);
+                return NT_STATUS_NO_MEMORY;
+        }
+
+        result->utok.uid = pwd->pw_uid;
+        result->utok.gid = pwd->pw_gid;
 
         *server_info = result;
 
+        return NT_STATUS_OK;
+}
+
+static NTSTATUS get_guest_info3(TALLOC_CTX *mem_ctx,
+                                struct netr_SamInfo3 *info3)
+{
+        const char *guest_account = lp_guestaccount();
+        struct dom_sid domain_sid;
+        struct passwd *pwd;
+        const char *tmp;
+
+        pwd = Get_Pwnam_alloc(mem_ctx, guest_account);
+        if (pwd == NULL) {
+                DEBUG(0,("SamInfo3_for_guest: Unable to locate guest "
+                         "account [%s]!\n", guest_account));
+                return NT_STATUS_NO_SUCH_USER;
+        }
+
+        /* Set acount name */
+        tmp = talloc_strdup(mem_ctx, pwd->pw_name);
+        if (tmp == NULL) {
+                return NT_STATUS_NO_MEMORY;
+        }
+        init_lsa_String(&info3->base.account_name, tmp);
+
+        /* Set domain name */
+        tmp = talloc_strdup(mem_ctx, get_global_sam_name());
+        if (tmp == NULL) {
+                return NT_STATUS_NO_MEMORY;
+        }
+        init_lsa_StringLarge(&info3->base.domain, tmp);
+
+        /* Domain sid */
+        sid_copy(&domain_sid, get_global_sam_sid());
+
+        info3->base.domain_sid = dom_sid_dup(mem_ctx, &domain_sid);
+        if (info3->base.domain_sid == NULL) {
+                return NT_STATUS_NO_MEMORY;
+        }
+
+        /* Guest rid */
+        info3->base.rid = DOMAIN_RID_GUEST;
+
+        /* Primary gid */
+        info3->base.primary_gid = BUILTIN_RID_GUESTS;
+
+        TALLOC_FREE(pwd);
         return NT_STATUS_OK;
 }
@@ -1262 +709 @@
 ***************************************************************************/
 
-static NTSTATUS make_new_server_info_guest(auth_serversupplied_info **server_info)
-{
+static NTSTATUS make_new_server_info_guest(struct auth_serversupplied_info **server_info)
+{
+        static const char zeros[16] = {0};
+        const char *guest_account = lp_guestaccount();
+        const char *domain = global_myname();
+        struct netr_SamInfo3 info3;
+        TALLOC_CTX *tmp_ctx;
         NTSTATUS status;
-        struct samu *sampass = NULL;
-        DOM_SID guest_sid;
-        bool ret;
-        char zeros[16];
         fstring tmp;
 
-        if ( !(sampass = samu_new( NULL )) ) {
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        sid_copy(&guest_sid, get_global_sam_sid());
-        sid_append_rid(&guest_sid, DOMAIN_USER_RID_GUEST);
-
-        become_root();
-        ret = pdb_getsampwsid(sampass, &guest_sid);
-        unbecome_root();
-
-        if (!ret) {
-                TALLOC_FREE(sampass);
-                return NT_STATUS_NO_SUCH_USER;
-        }
-
-        status = make_server_info_sam(server_info, sampass);
+        tmp_ctx = talloc_stackframe();
+        if (tmp_ctx == NULL) {
+                return NT_STATUS_NO_MEMORY;
+        }
+
+        ZERO_STRUCT(info3);
+
+        status = get_guest_info3(tmp_ctx, &info3);
         if (!NT_STATUS_IS_OK(status)) {
-                TALLOC_FREE(sampass);
-                return status;
-        }
-        
+                goto done;
+        }
+
+        status = make_server_info_info3(tmp_ctx,
+                                        guest_account,
+                                        domain,
+                                        server_info,
+                                        &info3);
+        if (!NT_STATUS_IS_OK(status)) {
+                goto done;
+        }
+
         (*server_info)->guest = True;
 
@@ -1299 +746 @@
                 DEBUG(10, ("create_local_token failed: %s\n",
                            nt_errstr(status)));
-                return status;
+                goto done;
         }
 
         /* annoying, but the Guest really does have a session key, and it is
            all zeros! */
-        ZERO_STRUCT(zeros);
         (*server_info)->user_session_key = data_blob(zeros, sizeof(zeros));
         (*server_info)->lm_session_key = data_blob(zeros, sizeof(zeros));
 
-        alpha_strcpy(tmp, pdb_get_username(sampass), ". _-$", sizeof(tmp));
+        alpha_strcpy(tmp, (*server_info)->info3->base.account_name.string,
+                     ". _-$", sizeof(tmp));
         (*server_info)->sanitized_username = talloc_strdup(*server_info, tmp);
+
+        status = NT_STATUS_OK;
+done:
+        TALLOC_FREE(tmp_ctx);
+        return NT_STATUS_OK;
+}
+
+/***************************************************************************
+ Make (and fill) a auth_session_info struct for a system user login.
+ This *must* succeed for smbd to start.
+***************************************************************************/
+
+static NTSTATUS make_new_session_info_system(TALLOC_CTX *mem_ctx,
+                                            struct auth_serversupplied_info **session_info)
+{
+        struct passwd *pwd;
+        NTSTATUS status;
+
+        pwd = getpwuid_alloc(mem_ctx, sec_initial_uid());
+        if (pwd == NULL) {
+                return NT_STATUS_NO_SUCH_USER;
+        }
+
+        status = make_serverinfo_from_username(mem_ctx,
+                                             pwd->pw_name,
+                                             false,
+                                             session_info);
+        TALLOC_FREE(pwd);
+        if (!NT_STATUS_IS_OK(status)) {
+                return status;
+        }
+
+        (*session_info)->system = true;
+
+        status = add_sid_to_array_unique((*session_info)->security_token->sids,
+                                         &global_sid_System,
+                                         &(*session_info)->security_token->sids,
+                                         &(*session_info)->security_token->num_sids);
+        if (!NT_STATUS_IS_OK(status)) {
+                TALLOC_FREE((*session_info));
+                return status;
+        }
 
         return NT_STATUS_OK;
@@ -1350 +839 @@
         }
 
-        *presult = result;
+        *presult = talloc_steal(mem_ctx, result);
         return NT_STATUS_OK;
 }
@@ -1356 +845 @@
 
 struct auth_serversupplied_info *copy_serverinfo(TALLOC_CTX *mem_ctx,
-                                                 const auth_serversupplied_info *src)
-{
-        auth_serversupplied_info *dst;
+                                                 const struct auth_serversupplied_info *src)
+{
+        struct auth_serversupplied_info *dst;
 
         dst = make_server_info(mem_ctx);
@@ -1366 +855 @@
 
         dst->guest = src->guest;
+        dst->system = src->system;
         dst->utok.uid = src->utok.uid;
         dst->utok.gid = src->utok.gid;
@@ -1377 +867 @@
         }
 
-        if (src->ptok) {
-                dst->ptok = dup_nt_token(dst, src->ptok);
-                if (!dst->ptok) {
+        if (src->security_token) {
+                dst->security_token = dup_nt_token(dst, src->security_token);
+                if (!dst->security_token) {
                         TALLOC_FREE(dst);
                         return NULL;
                 }
         }
-        
+
         dst->user_session_key = data_blob_talloc( dst, src->user_session_key.data,
                                                 src->user_session_key.length);
@@ -1391 +881 @@
                                                 src->lm_session_key.length);
 
-        dst->sam_account = samu_new(NULL);
-        if (!dst->sam_account) {
+        dst->info3 = copy_netr_SamInfo3(dst, src->info3);
+        if (!dst->info3) {
                 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->extra = src->extra;
+
         dst->unix_name = talloc_strdup(dst, src->unix_name);
         if (!dst->unix_name) {
@@ -1423 +908 @@
  */
 
-bool server_info_set_session_key(struct auth_serversupplied_info *info,
+bool session_info_set_session_key(struct auth_serversupplied_info *info,
                                  DATA_BLOB session_key)
 {
@@ -1434 +919 @@
 }
 
-static auth_serversupplied_info *guest_info = NULL;
+static struct auth_serversupplied_info *guest_info = NULL;
 
 bool init_guest_info(void)
@@ -1445 +930 @@
 
 NTSTATUS make_server_info_guest(TALLOC_CTX *mem_ctx,
-                                auth_serversupplied_info **server_info)
+                                struct auth_serversupplied_info **server_info)
 {
         *server_info = copy_serverinfo(mem_ctx, guest_info);
@@ -1451 +936 @@
 }
 
+static struct auth_serversupplied_info *system_info = NULL;
+
+NTSTATUS init_system_info(void)
+{
+        if (system_info != NULL)
+                return NT_STATUS_OK;
+
+        return make_new_session_info_system(NULL, &system_info);
+}
+
+NTSTATUS make_session_info_system(TALLOC_CTX *mem_ctx,
+                                struct auth_serversupplied_info **session_info)
+{
+        if (system_info == NULL) return NT_STATUS_UNSUCCESSFUL;
+        *session_info = copy_serverinfo(mem_ctx, system_info);
+        return (*session_info != NULL) ? NT_STATUS_OK : NT_STATUS_NO_MEMORY;
+}
+
+const struct auth_serversupplied_info *get_session_info_system(void)
+{
+    return system_info;
+}
+
 bool copy_current_user(struct current_user *dst, struct current_user *src)
 {
         gid_t *groups;
-        NT_USER_TOKEN *nt_token;
+        struct security_token *nt_token;
 
         groups = (gid_t *)memdup(src->ut.groups,
@@ -1480 +988 @@
 /***************************************************************************
  Purely internal function for make_server_info_info3
- Fill the sam account from getpwnam
 ***************************************************************************/
-static NTSTATUS fill_sam_account(TALLOC_CTX *mem_ctx, 
-                                 const char *domain,
-                                 const char *username,
-                                 char **found_username,
-                                 uid_t *uid, gid_t *gid,
-                                 struct samu *account,
-                                 bool *username_was_mapped)
-{
-        struct smbd_server_connection *sconn = smbd_server_conn;
-        NTSTATUS nt_status;
-        fstring dom_user, lower_username;
-        fstring real_username;
+
+static NTSTATUS check_account(TALLOC_CTX *mem_ctx, const char *domain,
+                              const char *username, char **found_username,
+                              struct passwd **pwd,
+                              bool *username_was_mapped)
+{
+        char *orig_dom_user = NULL;
+        char *dom_user = NULL;
+        char *lower_username = NULL;
+        char *real_username = NULL;
         struct passwd *passwd;
 
-        fstrcpy( lower_username, username );
+        lower_username = talloc_strdup(mem_ctx, username);
+        if (!lower_username) {
+                return NT_STATUS_NO_MEMORY;
+        }
         strlower_m( lower_username );
 
-        fstr_sprintf(dom_user, "%s%c%s", domain, *lp_winbind_separator(), 
-                lower_username);
-
-        /* Get the passwd struct.  Try to create the account is necessary. */
-
-        *username_was_mapped = map_username(sconn, dom_user);
-
-        if ( !(passwd = smb_getpwnam( NULL, dom_user, real_username, True )) )
+        orig_dom_user = talloc_asprintf(mem_ctx,
+                                "%s%c%s",
+                                domain,
+                                *lp_winbind_separator(),
+                                lower_username);
+        if (!orig_dom_user) {
+                return NT_STATUS_NO_MEMORY;
+        }
+
+        /* Get the passwd struct.  Try to create the account if necessary. */
+
+        *username_was_mapped = map_username(mem_ctx, orig_dom_user, &dom_user);
+        if (!dom_user) {
+                return NT_STATUS_NO_MEMORY;
+        }
+
+        passwd = smb_getpwnam(mem_ctx, dom_user, &real_username, True );
+        if (!passwd) {
+                DEBUG(3, ("Failed to find authenticated user %s via "
+                          "getpwnam(), denying access.\n", dom_user));
                 return NT_STATUS_NO_SUCH_USER;
-
-        *uid = passwd->pw_uid;
-        *gid = passwd->pw_gid;
+        }
+
+        if (!real_username) {
+                return NT_STATUS_NO_MEMORY;
+        }
+
+        *pwd = passwd;
 
         /* This is pointless -- there is no suport for differing 
@@ -1517 +1041 @@
            why I hate the 'winbind use default domain' parameter?   
                                          --jerry              */
-           
+
         *found_username = talloc_strdup( mem_ctx, real_username );
-        
-        DEBUG(5,("fill_sam_account: located username was [%s]\n", *found_username));
-
-        nt_status = samu_set_unix( account, passwd );
-        
-        TALLOC_FREE(passwd);
-        
-        return nt_status;
+
+        return NT_STATUS_OK;
 }
 
@@ -1534 +1052 @@
  the username if we fallback to the username only.
  ****************************************************************************/
- 
-struct passwd *smb_getpwnam( TALLOC_CTX *mem_ctx, char *domuser,
-                             fstring save_username, bool create )
+
+struct passwd *smb_getpwnam( TALLOC_CTX *mem_ctx, const char *domuser,
+                             char **p_save_username, bool create )
 {
         struct passwd *pw = NULL;
-        char *p;
-        fstring username;
-        
+        char *p = NULL;
+        char *username = NULL;
+
         /* we only save a copy of the username it has been mangled 
            by winbindd use default domain */
-           
-        save_username[0] = '\0';
-           
+        *p_save_username = NULL;
+
         /* don't call map_username() here since it has to be done higher 
-           up the stack so we don't call it mutliple times */
-
-        fstrcpy( username, domuser );
-        
+           up the stack so we don't call it multiple times */
+
+        username = talloc_strdup(mem_ctx, domuser);
+        if (!username) {
+                return NULL;
+        }
+
         p = strchr_m( username, *lp_winbind_separator() );
-        
+
         /* code for a DOMAIN\user string */
-        
+
         if ( p ) {
-                fstring strip_username;
-
                 pw = Get_Pwnam_alloc( mem_ctx, domuser );
-                if ( pw ) {     
+                if ( pw ) {
                         /* make sure we get the case of the username correct */
                         /* work around 'winbind use default domain = yes' */
@@ -1566 +1084 @@
                         if ( !strchr_m( pw->pw_name, *lp_winbind_separator() ) ) {
                                 char *domain;
-                                
+
                                 /* split the domain and username into 2 strings */
                                 *p = '\0';
                                 domain = username;
 
-                                fstr_sprintf(save_username, "%s%c%s", domain, *lp_winbind_separator(), pw->pw_name);
+                                *p_save_username = talloc_asprintf(mem_ctx,
+                                                                "%s%c%s",
+                                                                domain,
+                                                                *lp_winbind_separator(),
+                                                                pw->pw_name);
+                                if (!*p_save_username) {
+                                        TALLOC_FREE(pw);
+                                        return NULL;
+                                }
+                        } else {
+                                *p_save_username = talloc_strdup(mem_ctx, pw->pw_name);
                         }
-                        else
-                                fstrcpy( save_username, pw->pw_name );
-
-                        /* whew -- done! */             
+
+                        /* whew -- done! */
                         return pw;
                 }
@@ -1584 +1110 @@
 
                 p++;
-                fstrcpy( strip_username, p );
-                fstrcpy( username, strip_username );
-        }
-        
+                username = talloc_strdup(mem_ctx, p);
+                if (!username) {
+                        return NULL;
+                }
+        }
+
         /* just lookup a plain username */
-        
+
         pw = Get_Pwnam_alloc(mem_ctx, username);
-                
+
         /* Create local user if requested but only if winbindd
            is not running.  We need to protect against cases
            where winbindd is failing and then prematurely
            creating users in /etc/passwd */
-        
+
         if ( !pw && create && !winbind_ping() ) {
                 /* Don't add a machine account. */
@@ -1605 +1133 @@
                 pw = Get_Pwnam_alloc(mem_ctx, username);
         }
-        
+
         /* one last check for a valid passwd struct */
-        
-        if ( pw )
-                fstrcpy( save_username, pw->pw_name );
-
+
+        if (pw) {
+                *p_save_username = talloc_strdup(mem_ctx, pw->pw_name);
+        }
         return pw;
 }
@@ -1621 +1149 @@
                                 const char *sent_nt_username,
                                 const char *domain,
-                                auth_serversupplied_info **server_info, 
+                                struct auth_serversupplied_info **server_info,
                                 struct netr_SamInfo3 *info3)
 {
-        char zeros[16];
+        static const char zeros[16] = {0, };
 
         NTSTATUS nt_status = NT_STATUS_OK;
@@ -1630 +1158 @@
         const char *nt_domain;
         const char *nt_username;
-        struct samu *sam_account = NULL;
-        DOM_SID user_sid;
-        DOM_SID group_sid;
         bool username_was_mapped;
-
-        uid_t uid = (uid_t)-1;
-        gid_t gid = (gid_t)-1;
-
-        auth_serversupplied_info *result;
+        struct passwd *pwd;
+        struct auth_serversupplied_info *result;
+        struct dom_sid *group_sid;
+        struct netr_SamInfo3 *i3;
 
         /* 
@@ -1646 +1170 @@
         */
 
-        sid_copy(&user_sid, info3->base.domain_sid);
-        if (!sid_append_rid(&user_sid, info3->base.rid)) {
-                return NT_STATUS_INVALID_PARAMETER;
-        }
-        
-        sid_copy(&group_sid, info3->base.domain_sid);
-        if (!sid_append_rid(&group_sid, info3->base.primary_gid)) {
-                return NT_STATUS_INVALID_PARAMETER;
-        }
-
         nt_username = talloc_strdup(mem_ctx, info3->base.account_name.string);
         if (!nt_username) {
@@ -1669 +1183 @@
                 nt_domain = domain;
         }
-        
-        /* try to fill the SAM account..  If getpwnam() fails, then try the 
-           add user script (2.2.x behavior).
+
+        /* If getpwnam() fails try the add user script (2.2.x behavior).
 
            We use the _unmapped_ username here in an attempt to provide
@@ -1681 +1194 @@
            that is how the current code is designed.  Making the change here
            is the least disruptive place.  -- jerry */
-           
-        if ( !(sam_account = samu_new( NULL )) ) {
-                return NT_STATUS_NO_MEMORY;
-        }
 
         /* this call will try to create the user if necessary */
 
-        nt_status = fill_sam_account(mem_ctx, nt_domain, sent_nt_username,
-                                     &found_username, &uid, &gid, sam_account,
+        nt_status = check_account(mem_ctx, nt_domain, sent_nt_username,
+                                     &found_username, &pwd,
                                      &username_was_mapped);
 
-        
-        /* if we still don't have a valid unix account check for 
-          'map to guest = bad uid' */
-          
         if (!NT_STATUS_IS_OK(nt_status)) {
-                TALLOC_FREE( sam_account );
-                if ( lp_map_to_guest() == MAP_TO_GUEST_ON_BAD_UID ) {
-                        make_server_info_guest(NULL, server_info);
-                        return NT_STATUS_OK;
-                }
                 return nt_status;
-        }
-                
-        if (!pdb_set_nt_username(sam_account, nt_username, PDB_CHANGED)) {
-                TALLOC_FREE(sam_account);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        if (!pdb_set_username(sam_account, nt_username, PDB_CHANGED)) {
-                TALLOC_FREE(sam_account);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        if (!pdb_set_domain(sam_account, nt_domain, PDB_CHANGED)) {
-                TALLOC_FREE(sam_account);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        if (!pdb_set_user_sid(sam_account, &user_sid, PDB_CHANGED)) {
-                TALLOC_FREE(sam_account);
-                return NT_STATUS_UNSUCCESSFUL;
-        }
-
-        if (!pdb_set_group_sid(sam_account, &group_sid, PDB_CHANGED)) {
-                TALLOC_FREE(sam_account);
-                return NT_STATUS_UNSUCCESSFUL;
-        }
-
-        if (!pdb_set_fullname(sam_account,
-                              info3->base.full_name.string,
-                              PDB_CHANGED)) {
-                TALLOC_FREE(sam_account);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        if (!pdb_set_logon_script(sam_account,
-                                  info3->base.logon_script.string,
-                                  PDB_CHANGED)) {
-                TALLOC_FREE(sam_account);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        if (!pdb_set_profile_path(sam_account,
-                                  info3->base.profile_path.string,
-                                  PDB_CHANGED)) {
-                TALLOC_FREE(sam_account);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        if (!pdb_set_homedir(sam_account,
-                             info3->base.home_directory.string,
-                             PDB_CHANGED)) {
-                TALLOC_FREE(sam_account);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        if (!pdb_set_dir_drive(sam_account,
-                               info3->base.home_drive.string,
-                               PDB_CHANGED)) {
-                TALLOC_FREE(sam_account);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        if (!pdb_set_acct_ctrl(sam_account, info3->base.acct_flags, PDB_CHANGED)) {
-                TALLOC_FREE(sam_account);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        if (!pdb_set_pass_last_set_time(
-                    sam_account,
-                    nt_time_to_unix(info3->base.last_password_change),
-                    PDB_CHANGED)) {
-                TALLOC_FREE(sam_account);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        if (!pdb_set_pass_can_change_time(
-                    sam_account,
-                    nt_time_to_unix(info3->base.allow_password_change),
-                    PDB_CHANGED)) {
-                TALLOC_FREE(sam_account);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        if (!pdb_set_pass_must_change_time(
-                    sam_account,
-                    nt_time_to_unix(info3->base.force_password_change),
-                    PDB_CHANGED)) {
-                TALLOC_FREE(sam_account);
-                return NT_STATUS_NO_MEMORY;
         }
 
@@ -1797 +1208 @@
         if (result == NULL) {
                 DEBUG(4, ("make_server_info failed!\n"));
-                TALLOC_FREE(sam_account);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        /* save this here to _net_sam_logon() doesn't fail (it assumes a 
-           valid struct samu) */
-                   
-        result->sam_account = sam_account;
+                return NT_STATUS_NO_MEMORY;
+        }
+
         result->unix_name = talloc_strdup(result, found_username);
 
@@ -1814 +1220 @@
         }
 
+        /* copy in the info3 */
+        result->info3 = i3 = copy_netr_SamInfo3(result, info3);
+        if (result->info3 == NULL) {
+                TALLOC_FREE(result);
+                return NT_STATUS_NO_MEMORY;
+        }
+
         /* Fill in the unix info we found on the way */
-
-        result->utok.uid = uid;
-        result->utok.gid = gid;
-
-        /* Create a 'combined' list of all SIDs we might want in the SD */
-
-        result->num_sids = 0;
-        result->sids = NULL;
-
-        nt_status = sid_array_from_info3(result, info3,
-                                         &result->sids,
-                                         &result->num_sids,
-                                         false, false);
+        result->utok.uid = pwd->pw_uid;
+        result->utok.gid = pwd->pw_gid;
+
+        /* We can't just trust that the primary group sid sent us is something
+         * we can really use. Obtain the useable sid, and store the original
+         * one as an additional group if it had to be replaced */
+        nt_status = get_primary_group_sid(mem_ctx, found_username,
+                                          &pwd, &group_sid);
         if (!NT_STATUS_IS_OK(nt_status)) {
                 TALLOC_FREE(result);
@@ -1833 +1241 @@
         }
 
-        /* Ensure the primary group sid is at position 0. */
-        sort_sid_array_for_smbd(result, &group_sid);
-
-        result->login_server = talloc_strdup(result,
-                                             info3->base.logon_server.string);
+        /* store and check if it is the same we got originally */
+        sid_peek_rid(group_sid, &i3->base.primary_gid);
+        if (i3->base.primary_gid != info3->base.primary_gid) {
+                uint32_t n = i3->base.groups.count;
+                /* not the same, store the original as an additional group */
+                i3->base.groups.rids =
+                        talloc_realloc(i3, i3->base.groups.rids,
+                                        struct samr_RidWithAttribute, n + 1);
+                if (i3->base.groups.rids == NULL) {
+                        TALLOC_FREE(result);
+                        return NT_STATUS_NO_MEMORY;
+                }
+                i3->base.groups.rids[n].rid = info3->base.primary_gid;
+                i3->base.groups.rids[n].attributes = SE_GROUP_ENABLED;
+                i3->base.groups.count = n + 1;
+        }
 
         /* ensure we are never given NULL session keys */
-
-        ZERO_STRUCT(zeros);
 
         if (memcmp(info3->base.key.key, zeros, sizeof(zeros)) == 0) {
@@ -1874 +1291 @@
                                           const char *domain,
                                           const struct wbcAuthUserInfo *info,
-                                          auth_serversupplied_info **server_info)
-{
-        char zeros[16];
-
-        NTSTATUS nt_status = NT_STATUS_OK;
-        char *found_username = NULL;
-        const char *nt_domain;
-        const char *nt_username;
-        struct samu *sam_account = NULL;
-        DOM_SID user_sid;
-        DOM_SID group_sid;
-        bool username_was_mapped;
-        uint32_t i;
-
-        uid_t uid = (uid_t)-1;
-        gid_t gid = (gid_t)-1;
-
-        auth_serversupplied_info *result;
-
-        result = make_server_info(NULL);
-        if (result == NULL) {
-                DEBUG(4, ("make_server_info failed!\n"));
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        /*
-           Here is where we should check the list of
-           trusted domains, and verify that the SID
-           matches.
-        */
-
-        memcpy(&user_sid, &info->sids[0].sid, sizeof(user_sid));
-        memcpy(&group_sid, &info->sids[1].sid, sizeof(group_sid));
-
-        if (info->account_name) {
-                nt_username = talloc_strdup(result, info->account_name);
-        } else {
-                /* If the server didn't give us one, just use the one we sent
-                 * them */
-                nt_username = talloc_strdup(result, sent_nt_username);
-        }
-        if (!nt_username) {
-                TALLOC_FREE(result);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        if (info->domain_name) {
-                nt_domain = talloc_strdup(result, info->domain_name);
-        } else {
-                /* If the server didn't give us one, just use the one we sent
-                 * them */
-                nt_domain = talloc_strdup(result, domain);
-        }
-        if (!nt_domain) {
-                TALLOC_FREE(result);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        /* try to fill the SAM account..  If getpwnam() fails, then try the
-           add user script (2.2.x behavior).
-
-           We use the _unmapped_ username here in an attempt to provide
-           consistent username mapping behavior between kerberos and NTLM[SSP]
-           authentication in domain mode security.  I.E. Username mapping
-           should be applied to the fully qualified username
-           (e.g. DOMAIN\user) and not just the login name.  Yes this means we
-           called map_username() unnecessarily in make_user_info_map() but
-           that is how the current code is designed.  Making the change here
-           is the least disruptive place.  -- jerry */
-
-        if ( !(sam_account = samu_new( result )) ) {
-                TALLOC_FREE(result);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        /* this call will try to create the user if necessary */
-
-        nt_status = fill_sam_account(result, nt_domain, sent_nt_username,
-                                     &found_username, &uid, &gid, sam_account,
-                                     &username_was_mapped);
-
-        /* if we still don't have a valid unix account check for
-          'map to guest = bad uid' */
-
-        if (!NT_STATUS_IS_OK(nt_status)) {
-                TALLOC_FREE( result );
-                if ( lp_map_to_guest() == MAP_TO_GUEST_ON_BAD_UID ) {
-                        make_server_info_guest(NULL, server_info);
-                        return NT_STATUS_OK;
-                }
-                return nt_status;
-        }
-
-        if (!pdb_set_nt_username(sam_account, nt_username, PDB_CHANGED)) {
-                TALLOC_FREE(result);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        if (!pdb_set_username(sam_account, nt_username, PDB_CHANGED)) {
-                TALLOC_FREE(result);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        if (!pdb_set_domain(sam_account, nt_domain, PDB_CHANGED)) {
-                TALLOC_FREE(result);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        if (!pdb_set_user_sid(sam_account, &user_sid, PDB_CHANGED)) {
-                TALLOC_FREE(result);
-                return NT_STATUS_UNSUCCESSFUL;
-        }
-
-        if (!pdb_set_group_sid(sam_account, &group_sid, PDB_CHANGED)) {
-                TALLOC_FREE(result);
-                return NT_STATUS_UNSUCCESSFUL;
-        }
-
-        if (!pdb_set_fullname(sam_account, info->full_name, PDB_CHANGED)) {
-                TALLOC_FREE(result);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        if (!pdb_set_logon_script(sam_account, info->logon_script, PDB_CHANGED)) {
-                TALLOC_FREE(result);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        if (!pdb_set_profile_path(sam_account, info->profile_path, PDB_CHANGED)) {
-                TALLOC_FREE(result);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        if (!pdb_set_homedir(sam_account, info->home_directory, PDB_CHANGED)) {
-                TALLOC_FREE(result);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        if (!pdb_set_dir_drive(sam_account, info->home_drive, PDB_CHANGED)) {
-                TALLOC_FREE(result);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        if (!pdb_set_acct_ctrl(sam_account, info->acct_flags, PDB_CHANGED)) {
-                TALLOC_FREE(result);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        if (!pdb_set_pass_last_set_time(
-                    sam_account,
-                    info->pass_last_set_time,
-                    PDB_CHANGED)) {
-                TALLOC_FREE(result);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        if (!pdb_set_pass_can_change_time(
-                    sam_account,
-                    info->pass_can_change_time,
-                    PDB_CHANGED)) {
-                TALLOC_FREE(result);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        if (!pdb_set_pass_must_change_time(
-                    sam_account,
-                    info->pass_must_change_time,
-                    PDB_CHANGED)) {
-                TALLOC_FREE(result);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        /* save this here to _net_sam_logon() doesn't fail (it assumes a
-           valid struct samu) */
-
-        result->sam_account = sam_account;
-        result->unix_name = talloc_strdup(result, found_username);
-
-        result->sanitized_username = sanitize_username(result,
-                                                       result->unix_name);
-        result->login_server = talloc_strdup(result, info->logon_server);
-
-        if ((result->unix_name == NULL)
-            || (result->sanitized_username == NULL)
-            || (result->login_server == NULL)) {
-                TALLOC_FREE(result);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        /* Fill in the unix info we found on the way */
-
-        result->utok.uid = uid;
-        result->utok.gid = gid;
-
-        /* Create a 'combined' list of all SIDs we might want in the SD */
-
-        result->num_sids = info->num_sids - 2;
-        result->sids = talloc_array(result, DOM_SID, result->num_sids);
-        if (result->sids == NULL) {
-                TALLOC_FREE(result);
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        for (i=0; i < result->num_sids; i++) {
-                memcpy(&result->sids[i], &info->sids[i+2].sid, sizeof(result->sids[i]));
-        }
-
-        /* Ensure the primary group sid is at position 0. */
-        sort_sid_array_for_smbd(result, &group_sid);
-
-        /* ensure we are never given NULL session keys */
-
-        ZERO_STRUCT(zeros);
-
-        if (memcmp(info->user_session_key, zeros, sizeof(zeros)) == 0) {
-                result->user_session_key = data_blob_null;
-        } else {
-                result->user_session_key = data_blob_talloc(
-                        result, info->user_session_key,
-                        sizeof(info->user_session_key));
-        }
-
-        if (memcmp(info->lm_session_key, zeros, 8) == 0) {
-                result->lm_session_key = data_blob_null;
-        } else {
-                result->lm_session_key = data_blob_talloc(
-                        result, info->lm_session_key,
-                        sizeof(info->lm_session_key));
-        }
-
-        result->nss_token |= username_was_mapped;
-
-        *server_info = result;
-
-        return NT_STATUS_OK;
-}
-
-/***************************************************************************
- Free a user_info struct
-***************************************************************************/
-
-void free_user_info(auth_usersupplied_info **user_info)
-{
-        DEBUG(5,("attempting to free (and zero) a user_info structure\n"));
-        if (*user_info != NULL) {
-                if ((*user_info)->smb_name) {
-                        DEBUG(10,("structure was created for %s\n",
-                                  (*user_info)->smb_name));
-                }
-                SAFE_FREE((*user_info)->smb_name);
-                SAFE_FREE((*user_info)->internal_username);
-                SAFE_FREE((*user_info)->client_domain);
-                SAFE_FREE((*user_info)->domain);
-                SAFE_FREE((*user_info)->wksta_name);
-                data_blob_free(&(*user_info)->lm_resp);
-                data_blob_free(&(*user_info)->nt_resp);
-                data_blob_clear_free(&(*user_info)->lm_interactive_pwd);
-                data_blob_clear_free(&(*user_info)->nt_interactive_pwd);
-                data_blob_clear_free(&(*user_info)->plaintext_password);
-                ZERO_STRUCT(**user_info);
-        }
-        SAFE_FREE(*user_info);
-}
-
-/***************************************************************************
- Make an auth_methods struct
-***************************************************************************/
-
-bool make_auth_methods(struct auth_context *auth_context, auth_methods **auth_method) 
-{
-        if (!auth_context) {
-                smb_panic("no auth_context supplied to "
-                          "make_auth_methods()!\n");
-        }
-
-        if (!auth_method) {
-                smb_panic("make_auth_methods: pointer to auth_method pointer "
-                          "is NULL!\n");
-        }
-
-        *auth_method = TALLOC_P(auth_context->mem_ctx, auth_methods);
-        if (!*auth_method) {
-                DEBUG(0,("make_auth_method: malloc failed!\n"));
-                return False;
-        }
-        ZERO_STRUCTP(*auth_method);
-        
-        return True;
+                                          struct auth_serversupplied_info **server_info)
+{
+        struct netr_SamInfo3 *info3;
+
+        info3 = wbcAuthUserInfo_to_netr_SamInfo3(mem_ctx, info);
+        if (!info3) {
+                return NT_STATUS_NO_MEMORY;
+        }
+
+        return make_server_info_info3(mem_ctx,
+                                      sent_nt_username, domain,
+                                      server_info, info3);
 }
 
@@ -2174 +1315 @@
 bool is_trusted_domain(const char* dom_name)
 {
-        DOM_SID trustdom_sid;
+        struct dom_sid trustdom_sid;
         bool ret;
 
@@ -2220 +1361 @@
                    and running. We need to update the trustdom_cache
                    ourselves */
-                
+
                 update_trustdom_cache();
         }