diff options
| author | Gerald Carter <jerry@samba.org> | 2005-11-10 21:10:24 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:05:23 -0500 |
| commit | 9d9fe2d58de24ff7fd7f95bae878d299a1c6d33c (patch) | |
| tree | 9f48d8177b2df63d97c5c501d24f7cbcc00fcf5d /source3/lib | |
| parent | 6fdfa210de8df93256bf983e3cff8778a8fd934d (diff) | |
| download | samba-9d9fe2d58de24ff7fd7f95bae878d299a1c6d33c.tar.gz samba-9d9fe2d58de24ff7fd7f95bae878d299a1c6d33c.tar.bz2 samba-9d9fe2d58de24ff7fd7f95bae878d299a1c6d33c.zip | |
r11655: Two small fixes
* remove redundant call to sub_set_smb_name() in session setup code.
* Fix lockup when running 'wbinfo -t' on a Samba PDC. Cause
was new authenticated session setup from winbindd which
resulted in a mangled username (machine_) that was not found
in the local files and so was queiued up to nss_winbindd.
Deadlock....
So now make sure to keep the trailing '$' for machine account
names when calling sub_set_smb_name().
(This used to be commit b0a2d43b603c2e230da6ada73587696605102e8f)
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/substitute.c | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c index 884f038e6d..4d22518230 100644 --- a/source3/lib/substitute.c +++ b/source3/lib/substitute.c @@ -107,15 +107,37 @@ const char* get_local_machine_name(void) void sub_set_smb_name(const char *name) { fstring tmp; + int len; + BOOL is_machine_account = False; /* don't let anonymous logins override the name */ if (! *name) return; - fstrcpy(tmp,name); - trim_char(tmp,' ',' '); - strlower_m(tmp); - alpha_strcpy(smb_user_name,tmp,SAFE_NETBIOS_CHARS,sizeof(smb_user_name)-1); + + fstrcpy( tmp, name ); + trim_char( tmp, ' ', ' ' ); + strlower_m( tmp ); + + len = strlen( tmp ); + + if ( len == 0 ) + return; + + /* long story but here goes....we have to allow usernames + ending in '$' as they are valid machine account names. + So check for a machine account and re-add the '$' + at the end after the call to alpha_strcpy(). --jerry */ + + if ( tmp[len-1] == '$' ) + is_machine_account = True; + + alpha_strcpy( smb_user_name, tmp, SAFE_NETBIOS_CHARS, sizeof(smb_user_name)-1 ); + + if ( is_machine_account ) { + len = strlen( smb_user_name ); + smb_user_name[len-1] = '$'; + } } char* sub_get_smb_name( void ) |