sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-27 03:21:53 +03:00
Code

r1370: BUG 1297 - prevent map_username() from being called twice during logon

Browse Source
This commit is contained in:
Gerald Carter 2004-07-06 21:43:12 +00:00 committed by Gerald (Jerry) Carter
parent e2c7651e16
commit e1364ff774
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
source/auth/auth_util.c
View File

@ -972,25 +972,25 @@ struct passwd *smb_getpwnam( char *domuser, fstring save_username, BOOL create )
{
struct passwd *pw = NULL;
char *p;
fstring mapped_username;
fstring strip_username;
fstring username;
/* we only save a copy of the username it has been mangled
by winbindd use default domain */
save_username[0] = '\0';
/* save a local copy of the username and run it through the
username map */
fstrcpy( mapped_username, domuser );
map_username( mapped_username );
/* 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 );
p = strchr_m( mapped_username, *lp_winbind_separator() );
p = strchr_m( username, *lp_winbind_separator() );
/* code for a DOMAIN\user string */
if ( p ) {
fstring strip_username;
pw = Get_Pwnam( domuser );
if ( pw ) {
/* make sure we get the case of the username correct */
@ -999,8 +999,10 @@ struct passwd *smb_getpwnam( char *domuser, fstring save_username, BOOL create )
if ( !strchr_m( pw->pw_name, *lp_winbind_separator() ) ) {
char *domain;
domain = mapped_username;
/* 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);
}
else
@ -1011,26 +1013,26 @@ struct passwd *smb_getpwnam( char *domuser, fstring save_username, BOOL create )
}
/* setup for lookup of just the username */
/* remember that p and mapped_username are overlapping memory */
/* remember that p and username are overlapping memory */
p++;
fstrcpy( strip_username, p );
fstrcpy( mapped_username, strip_username );
fstrcpy( username, strip_username );
}
/* just lookup a plain username */
pw = Get_Pwnam(mapped_username);
pw = Get_Pwnam(username);
/* Create local user if requested. */
if ( !pw && create ) {
/* Don't add a machine account. */
if (mapped_username[strlen(mapped_username)-1] == '$')
if (username[strlen(username)-1] == '$')
return NULL;
auth_add_user_script(NULL, mapped_username);
pw = Get_Pwnam(mapped_username);
auth_add_user_script(NULL, username);
pw = Get_Pwnam(username);
}
/* one last check for a valid passwd struct */

2
source/smbd/sesssetup.c
View File

@ -242,6 +242,8 @@ static int reply_spnego_kerberos(connection_struct *conn,
/* lookup the passwd struct, create a new user if necessary */
map_username( user );
pw = smb_getpwnam( user, real_username, True );
if (!pw) {