From fcdebdae6fb69575bbe6e622b112d2e61f972898 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Thu, 28 Aug 2003 23:57:34 +0000
Subject: 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
 d405a93a9d3f9a1d93bb3289b00683fba3160bbe)

---
 source3/auth/auth_domain.c |  3 ---
 source3/lib/substitute.c   | 21 +++++++++++++++++----
 source3/smbd/process.c     |  2 +-
 3 files changed, 18 insertions(+), 8 deletions(-)

(limited to 'source3')

diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c
index aacea261fe..43e7597cd9 100644
--- a/source3/auth/auth_domain.c
+++ b/source3/auth/auth_domain.c
@@ -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.
  *
diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c
index 71c7b9ab1c..a73f9d85da 100644
--- a/source3/lib/substitute.c
+++ b/source3/lib/substitute.c
@@ -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.
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 373c2f16ae..457ba8cc63 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -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? */
-- 
cgit