1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00

Fix bug found by tridge in 2.2.x. Ensure that %U substitution is

restored on next valid packet if a logon fails. This has relevence
if people are using su.exe within logon scripts !
Jeremy.
(This used to be commit d405a93a9d)
This commit is contained in:
Jeremy Allison 2003-08-28 23:57:34 +00:00
parent afe845235a
commit fcdebdae6f
3 changed files with 18 additions and 8 deletions

View File

@ -26,9 +26,6 @@
extern BOOL global_machine_password_needs_changing;
extern userdom_struct current_user_info;
/**
* Connect to a remote server for domain security authenticaion.
*

View File

@ -98,16 +98,17 @@ const char* get_local_machine_name(void)
return local_machine;
}
/*******************************************************************
Setup the string used by %U substitution.
********************************************************************/
/*
setup the string used by %U substitution
*/
void sub_set_smb_name(const char *name)
{
fstring tmp;
/* don't let anonymous logins override the name */
if (! *name) return;
if (! *name)
return;
fstrcpy(tmp,name);
trim_string(tmp," "," ");
@ -115,6 +116,18 @@ void sub_set_smb_name(const char *name)
alpha_strcpy(smb_user_name,tmp,SAFE_NETBIOS_CHARS,sizeof(smb_user_name)-1);
}
/*******************************************************************
Setup the strings used by substitutions. Called per packet. Ensure
%U name is set correctly also.
********************************************************************/
void set_current_user_info(const userdom_struct *pcui)
{
current_user_info = *pcui;
/* The following is safe as current_user_info.smb_name
* has already been sanitised in register_vuid. */
fstrcpy(smb_user_name, current_user_info.smb_name);
}
/*******************************************************************
Given a pointer to a %$(NAME) expand it as an environment variable.

View File

@ -719,7 +719,7 @@ static int switch_message(int type,char *inbuf,char *outbuf,int size,int bufsize
if(session_tag != UID_FIELD_INVALID)
vuser = get_valid_user_struct(session_tag);
if(vuser != NULL)
current_user_info = vuser->user;
set_current_user_info(&vuser->user);
}
/* does this protocol need to be run as root? */