summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2004-03-19 22:06:54 +0000
committerGerald Carter <jerry@samba.org>2004-03-19 22:06:54 +0000
commitc24dccd413c41ed81454bc204c59d1fc17a54a33 (patch)
tree5dfc0b0db54ce4bf29cfb679340be4ed383cdcad
parentd0b10586d1f9661a6fcf6934e52f8877c2578745 (diff)
downloadsamba-c24dccd413c41ed81454bc204c59d1fc17a54a33.tar.gz
samba-c24dccd413c41ed81454bc204c59d1fc17a54a33.tar.bz2
samba-c24dccd413c41ed81454bc204c59d1fc17a54a33.zip
BUG 417: fix %UuGg variables expansion in include lines setging the current_user_info struct in register_vuid() -- shouldn't be any more broken than we were
(This used to be commit a90c3bd281e7a62bb8482e42aa3b674eeeb5995a)
-rw-r--r--source3/lib/substitute.c5
-rw-r--r--source3/lib/username.c5
-rw-r--r--source3/param/loadparm.c22
-rw-r--r--source3/smbd/password.c4
-rw-r--r--source3/smbd/sesssetup.c9
5 files changed, 43 insertions, 2 deletions
diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c
index 5dec980810..fed11c2298 100644
--- a/source3/lib/substitute.c
+++ b/source3/lib/substitute.c
@@ -116,6 +116,11 @@ void sub_set_smb_name(const char *name)
alpha_strcpy(smb_user_name,tmp,SAFE_NETBIOS_CHARS,sizeof(smb_user_name)-1);
}
+char* sub_get_smb_name( void )
+{
+ return smb_user_name;
+}
+
/*******************************************************************
Setup the strings used by substitutions. Called per packet. Ensure
%U name is set correctly also.
diff --git a/source3/lib/username.c b/source3/lib/username.c
index 40327f8168..ac5530b5c7 100644
--- a/source3/lib/username.c
+++ b/source3/lib/username.c
@@ -283,6 +283,11 @@ struct passwd *Get_Pwnam(const char *user)
fstring user2;
struct passwd *ret;
+ if ( *user == '\0' ) {
+ DEBUG(10,("Get_Pwnam: empty username!\n"));
+ return NULL;
+ }
+
fstrcpy(user2, user);
DEBUG(5,("Finding user %s\n", user));
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index af26697476..35bd464b56 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -2657,7 +2657,16 @@ static void add_to_file_list(const char *fname, const char *subfname)
BOOL lp_file_list_changed(void)
{
struct file_lists *f = file_lists;
- DEBUG(6, ("lp_file_list_changed()\n"));
+ char *username;
+
+ DEBUG(6, ("lp_file_list_changed()\n"));
+
+ /* get the username for substituion -- preference to the current_user_info */
+ if ( strlen( current_user_info.smb_name ) != 0 )
+ username = current_user_info.smb_name;
+ else
+ username = sub_get_smb_name();
+
while (f) {
pstring n2;
@@ -3806,9 +3815,18 @@ BOOL lp_load(const char *pszFname, BOOL global_only, BOOL save_defaults,
pstring n2;
BOOL bRetval;
param_opt_struct *data, *pdata;
+ char *username;
pstrcpy(n2, pszFname);
- standard_sub_basic(current_user_info.smb_name, n2,sizeof(n2));
+
+ /* get the username for substituion -- preference to the current_user_info */
+
+ if ( strlen( current_user_info.smb_name ) != 0 )
+ username = current_user_info.smb_name;
+ else
+ username = sub_get_smb_name();
+
+ standard_sub_basic( username, n2,sizeof(n2) );
add_to_file_list(pszFname, n2);
diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index 10c6aadb1f..9449113ddc 100644
--- a/source3/smbd/password.c
+++ b/source3/smbd/password.c
@@ -273,6 +273,10 @@ int register_vuid(auth_serversupplied_info *server_info, DATA_BLOB session_key,
/* Try and turn on server signing on the first non-guest sessionsetup. */
srv_set_signing(vuser->session_key, response_blob);
}
+
+ /* fill in the current_user_info struct */
+ set_current_user_info( &vuser->user );
+
return vuser->vuid;
}
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index d91aa94728..244db6d2c1 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -282,6 +282,9 @@ static int reply_spnego_kerberos(connection_struct *conn,
if (sess_vuid == -1) {
ret = NT_STATUS_LOGON_FAILURE;
} else {
+ /* current_user_info is changed on new vuid */
+ reload_services( True );
+
set_message(outbuf,4,0,True);
SSVAL(outbuf, smb_vwv3, 0);
@@ -355,6 +358,9 @@ static BOOL reply_spnego_ntlmssp(connection_struct *conn, char *inbuf, char *out
nt_status = NT_STATUS_LOGON_FAILURE;
} else {
+ /* current_user_info is changed on new vuid */
+ reload_services( True );
+
set_message(outbuf,4,0,True);
SSVAL(outbuf, smb_vwv3, 0);
@@ -911,6 +917,9 @@ int reply_sesssetup_and_X(connection_struct *conn, char *inbuf,char *outbuf,
return ERROR_NT(NT_STATUS_LOGON_FAILURE);
}
+ /* current_user_info is changed on new vuid */
+ reload_services( True );
+
if (!server_info->guest && !srv_check_sign_mac(inbuf)) {
exit_server("reply_sesssetup_and_X: bad smb signature");
}