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/smbd | |
| 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/smbd')
| -rw-r--r-- | source3/smbd/sesssetup.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c index 34b161c92f..9ac258cb5e 100644 --- a/source3/smbd/sesssetup.c +++ b/source3/smbd/sesssetup.c @@ -954,9 +954,6 @@ int reply_sesssetup_and_X(connection_struct *conn, char *inbuf,char *outbuf, return ERROR_NT(NT_STATUS_LOGON_FAILURE); } fstrcpy(sub_user, user); - - /* setup the string used by %U */ - sub_set_smb_name(user); } else { fstrcpy(sub_user, lp_guestaccount()); } |