Apply my experimental aliases support to HEAD. This will be a bit difficult to
[nivanova/samba-autobuild/.git] / source3 / auth / auth_util.c
index 744b4668aa34922cb64f9eb135adc65d7b4d6256..912432b98f89a2608167f6a01972b5718bcefb35 100644 (file)
@@ -1,4 +1,4 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
    Authentication utility functions
    Copyright (C) Andrew Tridgell 1992-1998
@@ -36,7 +36,7 @@ extern DOM_SID global_sid_Authenticated_Users;
  Create a UNIX user on demand.
 ****************************************************************************/
 
-static int smb_create_user(const char *unix_user, const char *homedir)
+static int smb_create_user(const char *domain, const char *unix_username, const char *homedir)
 {
        pstring add_script;
        int ret;
@@ -44,7 +44,9 @@ static int smb_create_user(const char *unix_user, const char *homedir)
        pstrcpy(add_script, lp_adduser_script());
        if (! *add_script)
                return -1;
-       all_string_sub(add_script, "%u", unix_user, sizeof(pstring));
+       all_string_sub(add_script, "%u", unix_username, sizeof(pstring));
+       if (domain)
+               all_string_sub(add_script, "%D", domain, sizeof(pstring));
        if (homedir)
                all_string_sub(add_script, "%H", homedir, sizeof(pstring));
        ret = smbrun(add_script,NULL);
@@ -54,27 +56,62 @@ static int smb_create_user(const char *unix_user, const char *homedir)
 
 /****************************************************************************
  Add and Delete UNIX users on demand, based on NTSTATUS codes.
+ We don't care about RID's here so ignore.
 ****************************************************************************/
 
-void smb_user_control(const auth_usersupplied_info *user_info, auth_serversupplied_info *server_info, NTSTATUS nt_status)
+void auth_add_user_script(const char *domain, const char *username)
 {
-       struct passwd *pwd=NULL;
+       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;
+               }
+       }
+}
 
-       if (NT_STATUS_IS_OK(nt_status)) {
+/****************************************************************************
+ Create a SAM_ACCOUNT - either by looking in the pdb, or by faking it up from
+ unix info.
+****************************************************************************/
 
-               if (!(server_info->sam_fill_level & SAM_FILL_UNIX)) {
-                       
-                       /*
-                        * 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() && !(pwd = Get_Pwnam(user_info->internal_username.str))) {
-                               smb_create_user(user_info->internal_username.str, NULL);
-                       }
+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;
 }
 
 /****************************************************************************
@@ -96,7 +133,7 @@ static NTSTATUS make_user_info(auth_usersupplied_info **user_info,
 
        *user_info = malloc(sizeof(**user_info));
        if (!user_info) {
-               DEBUG(0,("malloc failed for user_info (size %d)\n", sizeof(*user_info)));
+               DEBUG(0,("malloc failed for user_info (size %lu)\n", (unsigned long)sizeof(*user_info)));
                return NT_STATUS_NO_MEMORY;
        }
 
@@ -178,58 +215,26 @@ NTSTATUS make_user_info_map(auth_usersupplied_info **user_info,
        DEBUG(5, ("make_user_info_map: Mapping user [%s]\\[%s] from workstation [%s]\n",
              client_domain, smb_name, wksta_name));
        
-       if (lp_allow_trusted_domains() && *client_domain) {
-
-               /* the client could have given us a workstation name
-                  or other crap for the workgroup - we really need a
-                  way of telling if this domain name is one of our
-                  trusted domain names 
-
-                  Also don't allow "" as a domain, fixes a Win9X bug 
-                  where it doens't supply a domain for logon script
-                  'net use' commands.
-
-                  The way I do it here is by checking if the fully
-                  qualified username exists. This is rather reliant
-                  on winbind, but until we have a better method this
-                  will have to do 
-               */
+       /* don't allow "" as a domain, fixes a Win9X bug 
+          where it doens't supply a domain for logon script
+          'net use' commands.                                 */
 
+       if ( *client_domain )
                domain = client_domain;
+       else
+               domain = lp_workgroup();
 
-               if ((smb_name) && (*smb_name)) { /* Don't do this for guests */
-                       char *user = NULL;
-                       if (asprintf(&user, "%s%s%s", 
-                                client_domain, lp_winbind_separator(), 
-                                smb_name) < 0) {
-                               DEBUG(0, ("make_user_info_map: asprintf() failed!\n"));
-                               return NT_STATUS_NO_MEMORY;
-                       }
+       /* do what win2k does.  Always map unknown domains to our own
+          and let the "passdb backend" handle unknown users. */
 
-                       DEBUG(5, ("make_user_info_map: testing for user %s\n", user));
-                       
-                       if (Get_Pwnam(user) == NULL) {
-                               DEBUG(5, ("make_user_info_map: test for user %s failed\n", user));
-                               domain = lp_workgroup();
-                               DEBUG(5, ("make_user_info_map: trusted domain %s doesn't appear to exist, using %s\n", 
-                                         client_domain, domain));
-                       } else {
-                               DEBUG(5, ("make_user_info_map: using trusted domain %s\n", domain));
-                       }
-                       SAFE_FREE(user);
-               }
-       } else {
-               domain = lp_workgroup();
-       }
+       if ( !is_trusted_domain(domain) && !strequal(domain, get_global_sam_name()) ) 
+               domain = get_default_sam_name();
        
-       return make_user_info(user_info, 
-                             smb_name, internal_username,
-                             client_domain, domain,
-                             wksta_name, 
-                             lm_pwd, nt_pwd,
-                             plaintext, 
-                             ntlmssp_flags, encrypted);
+       /* 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);
 }
 
 /****************************************************************************
@@ -388,7 +393,7 @@ BOOL make_user_info_for_reply(auth_usersupplied_info **user_info,
                dump_data(100, plaintext_password.data, plaintext_password.length);
 #endif
 
-               SMBencrypt( (const uchar *)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
@@ -484,9 +489,9 @@ void debug_nt_user_token(int dbg_class, int dbg_lev, NT_USER_TOKEN *token)
        
        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 %i SIDs\n", token->num_sids));
+       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[%3i]: %s\n", i, 
+               DEBUGADDC(dbg_class, dbg_lev, ("SID[%3lu]: %s\n", (unsigned long)i, 
                                               sid_to_string(sid_str, &token->user_sids[i])));
 }
 
@@ -598,21 +603,21 @@ NT_USER_TOKEN *create_nt_token(uid_t uid, gid_t gid, int ngroups, gid_t *groups,
        NT_USER_TOKEN *token;
        int i;
 
-       if (!uid_to_sid(&user_sid, uid)) {
+       if (!NT_STATUS_IS_OK(uid_to_sid(&user_sid, uid))) {
                return NULL;
        }
-       if (!gid_to_sid(&group_sid, gid)) {
+       if (!NT_STATUS_IS_OK(gid_to_sid(&group_sid, gid))) {
                return NULL;
        }
 
-       group_sids   = malloc(sizeof(DOM_SID) * ngroups);
+       group_sids = malloc(sizeof(DOM_SID) * ngroups);
        if (!group_sids) {
                DEBUG(0, ("create_nt_token: malloc() failed for DOM_SID list!\n"));
                return NULL;
        }
 
        for (i = 0; i < ngroups; i++) {
-               if (!gid_to_sid(&(group_sids)[i], (groups)[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;
@@ -630,72 +635,147 @@ NT_USER_TOKEN *create_nt_token(uid_t uid, gid_t gid, int ngroups, gid_t *groups,
        return token;
 }
 
+static void add_gid_to_array_unique(gid_t gid, gid_t **groups, int *ngroups)
+{
+       int i;
+
+       if ((*ngroups) >= groups_max())
+               return;
+
+       for (i=0; i<*ngroups; i++) {
+               if ((*groups)[i] == gid)
+                       return;
+       }
+       
+       *groups = Realloc(*groups, ((*ngroups)+1) * sizeof(gid_t));
+
+       if (*groups == NULL)
+               return;
+
+       (*groups)[*ngroups] = gid;
+       *ngroups += 1;
+}
+
+static void add_foreign_gids_from_sid(const DOM_SID *sid, gid_t **groups,
+                                     int *ngroups)
+{
+       DOM_SID *aliases;
+       int j, num_aliases;
+
+       if (!pdb_enum_alias_memberships(sid, &aliases, &num_aliases))
+               return;
+
+       for (j=0; j<num_aliases; j++) {
+               gid_t gid;
+
+               if (!NT_STATUS_IS_OK(sid_to_gid(&aliases[j], &gid)))
+                       continue;
+
+               add_gid_to_array_unique(gid, groups, ngroups);
+       }
+       SAFE_FREE(aliases);
+}
+
+static void add_foreign_gids(uid_t uid, gid_t gid,
+                            gid_t **groups, int *ngroups)
+{
+       int i, dom_groups;
+       DOM_SID sid;
+
+       if (NT_STATUS_IS_OK(uid_to_sid(&sid, uid)))
+               add_foreign_gids_from_sid(&sid, groups, ngroups);
+
+       if (NT_STATUS_IS_OK(gid_to_sid(&sid, gid)))
+               add_foreign_gids_from_sid(&sid, groups, ngroups);
+
+       dom_groups = *ngroups;
+
+       for (i=0; i<dom_groups; i++) {
+
+               if (!NT_STATUS_IS_OK(gid_to_sid(&sid, (*groups)[i])))
+                       continue;
+
+               add_foreign_gids_from_sid(&sid, groups, ngroups);
+       }
+}
+
 /******************************************************************************
  * 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. 
+ * 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
  ******************************************************************************/
 
-static NTSTATUS get_user_groups_from_local_sam(const DOM_SID *user_sid, 
-                                              int *n_groups, DOM_SID **groups, gid_t **unix_groups)
+static NTSTATUS get_user_groups(const char *username, uid_t uid, gid_t gid,
+                                int *n_groups, DOM_SID **groups, gid_t **unix_groups)
 {
-       uid_t             uid;
-       enum SID_NAME_USE snu;
-       fstring           str;
-       int               n_unix_groups;
-       int               i;
-       struct passwd    *usr;  
-       
+       int             n_unix_groups;
+       int             i;
+
        *n_groups = 0;
        *groups   = NULL;
        
-       if (!sid_to_uid(user_sid,  &uid, &snu)) {
-               DEBUG(2, ("get_user_groups_from_local_sam: Failed to convert user SID %s to a uid!\n", 
-                         sid_to_string(str, user_sid)));
-               /* This might be a non-unix account */
-               return NT_STATUS_OK;
-       }
+       /* Try winbind first */
 
-       /*
-        * This is _essential_ to prevent occasional segfaults when
-        * winbind can't find uid -> username mapping
-        */
-       if (!(usr = getpwuid_alloc(uid))) {
-               DEBUG(0, ("Couldn't find passdb structure for UID = %d ! Aborting.\n", uid));
-               return NT_STATUS_NO_SUCH_USER;
-       };
-       
-       n_unix_groups = groups_max();
-       if ((*unix_groups = malloc( sizeof(gid_t) * groups_max() ) ) == NULL) {
-               DEBUG(0, ("get_user_groups_from_local_sam: Out of memory allocating unix group list\n"));
-               passwd_free(&usr);
-               return NT_STATUS_NO_MEMORY;
+       if ( strchr(username, *lp_winbind_separator()) ) {
+               n_unix_groups = winbind_getgroups( username, unix_groups );
+
+               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? */  
        }
+       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(usr->pw_name, usr->pw_gid, *unix_groups, &n_unix_groups) == -1) {
-               *unix_groups = Realloc(unix_groups, sizeof(gid_t) * n_unix_groups);
-               if (sys_getgrouplist(usr->pw_name, usr->pw_gid, *unix_groups, &n_unix_groups) == -1) {
-                       DEBUG(0, ("get_user_groups_from_local_sam: failed to get the unix group list\n"));
-                       SAFE_FREE(unix_groups);
-                       passwd_free(&usr);
-                       return NT_STATUS_NO_SUCH_USER; /* what should this return value be? */
+               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? */
+                       }
                }
        }
 
-       debug_unix_user_token(DBGC_CLASS, 5, usr->pw_uid, usr->pw_gid, n_unix_groups, *unix_groups);
+       add_foreign_gids(uid, gid, unix_groups, &n_unix_groups);
 
-       passwd_free(&usr);
+       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_from_local_sam: malloc() failed for DOM_SID list!\n"));
-                       SAFE_FREE(unix_groups);
+                       DEBUG(0, ("get_user_group: malloc() failed for DOM_SID list!\n"));
+                       SAFE_FREE(*unix_groups);
                        return NT_STATUS_NO_MEMORY;
                }
        }
@@ -703,10 +783,11 @@ static NTSTATUS get_user_groups_from_local_sam(const DOM_SID *user_sid,
        *n_groups = n_unix_groups;
 
        for (i = 0; i < *n_groups; i++) {
-               if (!gid_to_sid(&(*groups)[i], (*unix_groups)[i])) {
-                       DEBUG(1, ("get_user_groups_from_local_sam: failed to convert gid %ld to a sid!\n", (long int)unix_groups[i+1]));
-                       SAFE_FREE(groups);
-                       SAFE_FREE(unix_groups);
+               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;
                }
        }
@@ -718,7 +799,7 @@ static NTSTATUS get_user_groups_from_local_sam(const DOM_SID *user_sid,
  Make a user_info struct
 ***************************************************************************/
 
-static NTSTATUS make_server_info(auth_serversupplied_info **server_info, SAM_ACCOUNT *sampass)
+static NTSTATUS make_server_info(auth_serversupplied_info **server_info)
 {
        *server_info = malloc(sizeof(**server_info));
        if (!*server_info) {
@@ -727,20 +808,25 @@ static NTSTATUS make_server_info(auth_serversupplied_info **server_info, SAM_ACC
        }
        ZERO_STRUCTP(*server_info);
 
-       (*server_info)->sam_fill_level = SAM_FILL_ALL;
-       (*server_info)->sam_account    = sampass;
+       /* 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;
 
        return NT_STATUS_OK;
 }
 
 /***************************************************************************
- Make (and fill) a user_info struct from a SAM_ACCOUNT
+Fill a server_info struct from a SAM_ACCOUNT with their groups
 ***************************************************************************/
 
-NTSTATUS make_server_info_sam(auth_serversupplied_info **server_info, 
-                             SAM_ACCOUNT *sampass)
+static NTSTATUS add_user_groups(auth_serversupplied_info **server_info, 
+                               SAM_ACCOUNT *sampass,
+                               uid_t uid, gid_t gid)
 {
-       NTSTATUS nt_status = NT_STATUS_OK;
+       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;
@@ -750,14 +836,10 @@ NTSTATUS make_server_info_sam(auth_serversupplied_info **server_info,
        BOOL is_guest;
        uint32 rid;
 
-       if (!NT_STATUS_IS_OK(nt_status = make_server_info(server_info, sampass))) {
-               return nt_status;
-       }
-       
-       if (!NT_STATUS_IS_OK(nt_status 
-                            = get_user_groups_from_local_sam(pdb_get_user_sid(sampass), 
-               &n_groupSIDs, &groupSIDs, &unix_groups)))
-       {
+       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;
@@ -780,11 +862,49 @@ NTSTATUS make_server_info_sam(auth_serversupplied_info **server_info,
 
        (*server_info)->n_groups = n_groupSIDs;
        (*server_info)->groups = unix_groups;
-
        (*server_info)->ptok = token;
+
+       return nt_status;
+}
+
+/***************************************************************************
+ Make (and fill) a user_info struct from a SAM_ACCOUNT
+***************************************************************************/
+
+NTSTATUS make_server_info_sam(auth_serversupplied_info **server_info, 
+                             SAM_ACCOUNT *sampass)
+{
+       NTSTATUS nt_status;
+       struct passwd *pwd;
+
+       if (!NT_STATUS_IS_OK(nt_status = make_server_info(server_info)))
+               return nt_status;
+
+       (*server_info)->sam_account    = sampass;
+
+       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;
+       }
+       (*server_info)->unix_name = smb_xstrdup(pwd->pw_name);
+       (*server_info)->gid = pwd->pw_gid;
+       (*server_info)->uid = pwd->pw_uid;
        
-       DEBUG(5,("make_server_info_sam: made server info for user %s\n",
-                pdb_get_username((*server_info)->sam_account)));
+       passwd_free(&pwd);
+
+       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;
+       }
+
+       (*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));
 
        return nt_status;
 }
@@ -801,7 +921,22 @@ NTSTATUS make_server_info_pw(auth_serversupplied_info **server_info, const struc
        if (!NT_STATUS_IS_OK(nt_status = pdb_init_sam_pw(&sampass, pwd))) {             
                return nt_status;
        }
-       return make_server_info_sam(server_info, sampass);
+       if (!NT_STATUS_IS_OK(nt_status = make_server_info(server_info))) {
+               return nt_status;
+       }
+
+       (*server_info)->sam_account    = sampass;
+
+       if (!NT_STATUS_IS_OK(nt_status = add_user_groups(server_info, sampass, pwd->pw_uid, pwd->pw_gid))) {
+               return nt_status;
+       }
+
+       (*server_info)->unix_name = smb_xstrdup(pwd->pw_name);
+
+       (*server_info)->sam_fill_level = SAM_FILL_ALL;
+       (*server_info)->uid = pwd->pw_uid;
+       (*server_info)->gid = pwd->pw_gid;
+       return nt_status;
 }
 
 /***************************************************************************
@@ -830,11 +965,128 @@ NTSTATUS make_server_info_guest(auth_serversupplied_info **server_info)
 
        nt_status = make_server_info_sam(server_info, sampass);
 
-       (*server_info)->guest = True;
+       if (NT_STATUS_IS_OK(nt_status)) {
+               static const char zeros[16];
+               (*server_info)->guest = True;
+               
+               /* annoying, but the Guest really does have a session key, 
+                  and it is all zeros! */
+               (*server_info)->nt_session_key = data_blob(zeros, sizeof(zeros));
+               (*server_info)->lm_session_key = data_blob(zeros, sizeof(zeros));
+       }
 
        return nt_status;
 }
 
+/***************************************************************************
+ 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,
+                                SAM_ACCOUNT **sam_account)
+{
+       fstring dom_user;
+       struct passwd *passwd;
+
+       fstr_sprintf(dom_user, "%s%s%s", domain, lp_winbind_separator(), 
+               username);
+
+       passwd = Get_Pwnam(dom_user);
+       
+       if ( passwd ) {
+               char *p;
+               
+               /* make sure we get the case of the username correct */
+               /* work around 'winbind use default domain = yes' */
+               
+               p = strchr( passwd->pw_name, *lp_winbind_separator() );
+               if ( !p ) 
+                       fstr_sprintf(dom_user, "%s%s%s", domain, 
+                               lp_winbind_separator(), passwd->pw_name);
+               else 
+                       fstrcpy( dom_user, passwd->pw_name );
+       }
+       else {
+               /* 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 */
+
+               fstrcpy( dom_user, username );
+               passwd = Get_Pwnam( dom_user );
+               
+               /* make sure we get the case of the username correct */
+               if ( passwd )
+                       fstrcpy( dom_user, passwd->pw_name );
+       }
+
+       if ( !passwd )
+               return NT_STATUS_NO_SUCH_USER;
+
+       *uid = passwd->pw_uid;
+       *gid = passwd->pw_gid;
+
+       /* This is pointless -- there is no suport for differeing 
+          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);
+       
+       DEBUG(5,("fill_sam_account: located username was [%s]\n",
+               *found_username));
+
+       return pdb_init_sam_pw(sam_account, passwd);
+}
+
+/****************************************************************************
+ 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 *pw = NULL;
+       char *p;
+       fstring mapped_username;
+
+       pw = Get_Pwnam( domuser );
+       if ( pw )
+               return pw;
+
+       /* fallback to looking up just the username */
+
+       p = strchr( domuser, *lp_winbind_separator() );
+
+       if ( p ) {
+               p += 1;
+               fstrcpy( mapped_username, p );
+               map_username( mapped_username );        
+               pw = Get_Pwnam(mapped_username);
+               if (!pw) {
+                       /* Don't add a machine account. */
+                       if (mapped_username[strlen(mapped_username)-1] == '$')
+                               return NULL;
+
+                       /* Create local user if requested. */
+                       p = strchr( mapped_username, *lp_winbind_separator() );
+                       if (p)
+                               p += 1;
+                       else
+                               p = mapped_username;
+                       auth_add_user_script(NULL, p);
+                       return Get_Pwnam(p);
+               }
+       }
+
+       return pw;
+}
+
 /***************************************************************************
  Make a server_info struct from the info3 returned by a domain logon 
 ***************************************************************************/
@@ -846,8 +1098,10 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
                                auth_serversupplied_info **server_info, 
                                NET_USER_INFO_3 *info3) 
 {
-       NTSTATUS nt_status = NT_STATUS_OK;
+       static const char zeros[16];
 
+       NTSTATUS nt_status = NT_STATUS_OK;
+       char *found_username;
        const char *nt_domain;
        const char *nt_username;
 
@@ -855,8 +1109,6 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
        DOM_SID user_sid;
        DOM_SID group_sid;
 
-       struct passwd *passwd;
-
        uid_t uid;
        gid_t gid;
 
@@ -892,40 +1144,22 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
 
        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;
+               nt_domain = domain;
        }
-
-       if (winbind_sid_to_uid(&uid, &user_sid) 
-           && winbind_sid_to_gid(&gid, &group_sid) 
-           && ((passwd = getpwuid_alloc(uid)))) {
-               nt_status = pdb_init_sam_pw(&sam_account, passwd);
-               passwd_free(&passwd);
-       } else {
-               char *dom_user;
-               dom_user = talloc_asprintf(mem_ctx, "%s%s%s", 
-                                          nt_domain,
-                                          lp_winbind_separator(),
-                                          internal_username);
-               
-               if (!dom_user) {
-                       DEBUG(0, ("talloc_asprintf failed!\n"));
-                       return NT_STATUS_NO_MEMORY;
-               } else { 
-               
-                       if (!(passwd = Get_Pwnam(dom_user))
-                               /* Only lookup local for the local
-                                  domain, we don't want this for
-                                  trusted domains */
-                           && strequal(nt_domain, lp_workgroup())) {
-                               passwd = Get_Pwnam(internal_username);
-                       }
-                           
-                       if (!passwd) {
-                               return NT_STATUS_NO_SUCH_USER;
-                       } else {
-                               nt_status = pdb_init_sam_pw(&sam_account, passwd);
-                       }
-               }
+       
+       /* try to fill the SAM account..  If getpwnam() fails, then try the 
+          add user script (2.2.x behavior) */
+          
+       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 (!NT_STATUS_IS_OK(nt_status)) {
@@ -933,17 +1167,12 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
                return nt_status;
        }
                
-       if (!pdb_set_user_sid(sam_account, &user_sid, PDB_CHANGED)) {
+       if (!pdb_set_nt_username(sam_account, nt_username, PDB_CHANGED)) {
                pdb_free_sam(&sam_account);
-               return NT_STATUS_UNSUCCESSFUL;
+               return NT_STATUS_NO_MEMORY;
        }
 
-       if (!pdb_set_group_sid(sam_account, &group_sid, PDB_CHANGED)) {
-               pdb_free_sam(&sam_account);
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-               
-       if (!pdb_set_nt_username(sam_account, nt_username, PDB_CHANGED)) {
+       if (!pdb_set_username(sam_account, nt_username, PDB_CHANGED)) {
                pdb_free_sam(&sam_account);
                return NT_STATUS_NO_MEMORY;
        }
@@ -953,7 +1182,18 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
                return NT_STATUS_NO_MEMORY;
        }
 
-       if (!pdb_set_fullname(sam_account, unistr2_static(&(info3->uni_full_name)), PDB_CHANGED)) {
+       if (!pdb_set_user_sid(sam_account, &user_sid, PDB_CHANGED)) {
+               pdb_free_sam(&sam_account);
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       if (!pdb_set_group_sid(sam_account, &group_sid, PDB_CHANGED)) {
+               pdb_free_sam(&sam_account);
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+               
+       if (!pdb_set_fullname(sam_account, unistr2_static(&(info3->uni_full_name)), 
+                             PDB_CHANGED)) {
                pdb_free_sam(&sam_account);
                return NT_STATUS_NO_MEMORY;
        }
@@ -978,22 +1218,33 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
                return NT_STATUS_NO_MEMORY;
        }
 
-       if (!NT_STATUS_IS_OK(nt_status = make_server_info(server_info, sam_account))) {
+       if (!NT_STATUS_IS_OK(nt_status = make_server_info(server_info))) {
                DEBUG(4, ("make_server_info failed!\n"));
                pdb_free_sam(&sam_account);
                return nt_status;
        }
 
+       /* save this here to _net_sam_logon() doesn't fail (it assumes a 
+          valid SAM_ACCOUNT) */
+                  
+       (*server_info)->sam_account = sam_account;
+
+       (*server_info)->unix_name = smb_xstrdup(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;
+
        /* Store the user group information in the server_info 
           returned to the caller. */
        
-       if (!NT_STATUS_IS_OK(nt_status 
-                            = get_user_groups_from_local_sam(&user_sid, 
-                                                             &n_lgroupSIDs, 
-                                                             &lgroupSIDs, 
-                                                             &unix_groups)))
-       {
-               DEBUG(4,("get_user_groups_from_local_sam failed\n"));
+       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;
        }
 
@@ -1001,28 +1252,40 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
        (*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) * 
-                                 (n_lgroupSIDs + info3->num_groups2 +
-                                  info3->num_other_sids));
+       
+       all_group_SIDs = malloc(sizeof(DOM_SID) * (info3->num_groups2 +info3->num_other_sids));
+       
        if (!all_group_SIDs) {
-               DEBUG(0, ("create_nt_token_info3: malloc() failed for DOM_SID list!\n"));
+               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
 
        /* and create (by appending rids) the 'domain' sids */
+       
        for (i = 0; i < info3->num_groups2; i++) {
-               sid_copy(&all_group_SIDs[i+n_lgroupSIDs], &(info3->dom_sid.sid));
-               if (!sid_append_rid(&all_group_SIDs[i+n_lgroupSIDs], info3->gids[i].g_rid)) {
+       
+               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,("create_nt_token_info3: could not append additional group rid 0x%x\n",
+                       
+                       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;
+                       
                }
        }
 
@@ -1032,28 +1295,43 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
            http://www.microsoft.com/windows2000/techinfo/administration/security/sidfilter.asp
          */
 
-       for (i = 0; i < info3->num_other_sids; i++) 
-               sid_copy(&all_group_SIDs[
-                                n_lgroupSIDs + info3->num_groups2 + i],
+       for (i = 0; i < info3->num_other_sids; i++) {
+               sid_copy(&all_group_SIDs[info3->num_groups2 + i],
                         &info3->other_sids[i].sid);
+       }
        
        /* Where are the 'global' sids... */
 
        /* can the user be guest? if yes, where is it stored? */
-       if (!NT_STATUS_IS_OK(
-                   nt_status = create_nt_user_token(
-                           &user_sid, &group_sid,
-                           n_lgroupSIDs + info3->num_groups2 + info3->num_other_sids, 
-                           all_group_SIDs, False, &token))) {
+       
+       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;
        }
 
        (*server_info)->ptok = token; 
 
        SAFE_FREE(all_group_SIDs);
+
+       /* ensure we are never given NULL session keys */
        
+       if (memcmp(info3->user_sess_key, zeros, sizeof(zeros)) == 0) {
+               (*server_info)->nt_session_key = data_blob(NULL, 0);
+       } else {
+               (*server_info)->nt_session_key = data_blob(info3->user_sess_key, sizeof(info3->user_sess_key));
+       }
+
+       if (memcmp(info3->padding, zeros, sizeof(zeros)) == 0) {
+               (*server_info)->lm_session_key = data_blob(NULL, 0);
+       } else {
+               (*server_info)->lm_session_key = data_blob(info3->padding, 16);
+       }
        return NT_STATUS_OK;
 }
 
@@ -1095,6 +1373,9 @@ void free_server_info(auth_serversupplied_info **server_info)
                /* 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);
+               data_blob_free(&(*server_info)->lm_session_key);
+               data_blob_free(&(*server_info)->nt_session_key);
                ZERO_STRUCT(**server_info);
        }
        SAFE_FREE(*server_info);
@@ -1192,4 +1473,52 @@ NTSTATUS nt_status_squash(NTSTATUS nt_status)
 }
 
 
+/**
+ * Verify whether or not given domain is trusted.
+ *
+ * @param domain_name name of the domain to be verified
+ * @return true if domain is one of the trusted once or
+ *         false if otherwise
+ **/
+
+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 */
+
+       if ( lp_server_role() == ROLE_STANDALONE )
+               return False;
+
+       /* 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) {
+               become_root();
+               ret = secrets_fetch_trusted_domain_password(dom_name, &pass, &trustdom_sid, &lct);
+               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 */
+
+               if ( !winbind_ping() )
+                       update_trustdom_cache();
+       }
+
+       /* now the trustdom cache should be available a DC could still
+        * have a transitive trust so fall back to the cache of trusted
+        * domains (like a domain member would use  */
+
+       if ( trustdom_cache_fetch(dom_name, &trustdom_sid) ) {
+               return True;
+       }
+
+       return False;
+}