summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-04-30 17:42:39 +0200
committerVolker Lendecke <vl@samba.org>2008-05-05 18:28:59 +0200
commitbec1dfab27be3db888eeb451b4547f16e08e93c3 (patch)
treef1b85618a0bf8ecd39a07d0039fb3b843477f6f1 /source3/lib
parenta683625d7fe0be58da23b98828b445478df1606f (diff)
downloadsamba-bec1dfab27be3db888eeb451b4547f16e08e93c3.tar.gz
samba-bec1dfab27be3db888eeb451b4547f16e08e93c3.tar.bz2
samba-bec1dfab27be3db888eeb451b4547f16e08e93c3.zip
Remove "userdom_struct user" from "struct user_struct"
(This used to be commit 420de035237bb08bc470c9eb820f3da2edaa6805)
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/substitute.c11
1 files changed, 9 insertions, 2 deletions
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. */