diff options
| author | Gerald Carter <jerry@samba.org> | 2004-03-19 22:06:54 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2004-03-19 22:06:54 +0000 |
| commit | c24dccd413c41ed81454bc204c59d1fc17a54a33 (patch) | |
| tree | 5dfc0b0db54ce4bf29cfb679340be4ed383cdcad /source3/lib | |
| parent | d0b10586d1f9661a6fcf6934e52f8877c2578745 (diff) | |
| download | samba-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)
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/substitute.c | 5 | ||||
| -rw-r--r-- | source3/lib/username.c | 5 |
2 files changed, 10 insertions, 0 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)); |