From bec1dfab27be3db888eeb451b4547f16e08e93c3 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 30 Apr 2008 17:42:39 +0200 Subject: Remove "userdom_struct user" from "struct user_struct" (This used to be commit 420de035237bb08bc470c9eb820f3da2edaa6805) --- source3/lib/substitute.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'source3/lib/substitute.c') diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c index 62dfdb56b5..c8ad6199e8 100644 --- a/source3/lib/substitute.c +++ b/source3/lib/substitute.c @@ -213,11 +213,18 @@ static const char *get_smb_user_name(void) /******************************************************************* Setup the strings used by substitutions. Called per packet. Ensure %U name is set correctly also. + + smb_name must be sanitized by alpha_strcpy ********************************************************************/ -void set_current_user_info(const userdom_struct *pcui) +void set_current_user_info(const char *smb_name, const char *unix_name, + const char *full_name, const char *domain) { - current_user_info = *pcui; + fstrcpy(current_user_info.smb_name, smb_name); + fstrcpy(current_user_info.unix_name, unix_name); + fstrcpy(current_user_info.full_name, full_name); + fstrcpy(current_user_info.domain, domain); + /* The following is safe as current_user_info.smb_name * has already been sanitised in register_existing_vuid. */ -- cgit