sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

%U substitution should be unix user not nt user

Browse Source 
(This used to be commit f4b8a28306)
This commit is contained in:
Luke Leighton
1998-12-11 19:27:19 +00:00
parent 3cc7e2936a
commit 41daca8ceb
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source3/passdb/passdb.c
View File

@ -308,6 +308,10 @@ struct smb_passwd *pwdb_smb_map_names(struct smb_passwd *smb)
if (!sid_front_equal(&global_sam_sid, &gmep.sid))
{
fstring sid_str;
sid_to_string(sid_str, &gmep.sid);
DEBUG(0,("UNIX User %s Primary Group is in the wrong domain! %s\n",
smb->unix_name, sid_str));
return NULL;
}

9
source3/passdb/sampass.c
View File

@ -95,10 +95,11 @@ static struct sam_passwd *getsamfile21pwent(void *vp)
}
/*
* get all the other gubbins we need
* get all the other gubbins we need. substitute unix name for %U
* as putting the nt name in is a bit meaningless.
*/
pstrcpy(samlogon_user, user->nt_name);
pstrcpy(samlogon_user, user->unix_name);
if (samlogon_user[strlen(samlogon_user)-1] == '$' &&
user->group_rid != DOMAIN_GROUP_RID_USERS)
@ -156,9 +157,9 @@ static BOOL add_samfile21pwd_entry(struct sam_passwd *newpwd)
return add_smbpwd_entry(pwdb_sam_to_smb(newpwd));
}
static struct sam_disp_info *getsamfiledispntnam(const char *name)
static struct sam_disp_info *getsamfiledispntnam(const char *ntname)
{
return pwdb_sam_to_dispinfo(getsam21pwntnam(name));
return pwdb_sam_to_dispinfo(getsam21pwntnam(ntname));
}
static struct sam_disp_info *getsamfiledisprid(uint32 rid)