summaryrefslogtreecommitdiff
path: root/source3/smbd/reply.c
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2001-09-12 06:39:50 +0000
committerTim Potter <tpot@samba.org>2001-09-12 06:39:50 +0000
commitb800a36b1c81fb37ca963acdc49978ff065fb0d7 (patch)
tree4fe3edd68f6bbf7db66c75aa8c5c29b79d4dd01a /source3/smbd/reply.c
parent39d7983a470cc3470dd7126de35697d965817cb6 (diff)
downloadsamba-b800a36b1c81fb37ca963acdc49978ff065fb0d7.tar.gz
samba-b800a36b1c81fb37ca963acdc49978ff065fb0d7.tar.bz2
samba-b800a36b1c81fb37ca963acdc49978ff065fb0d7.zip
Some patches to authentication:
- the usersupplied_info now contains a smb_username (as it comes across on the wire) and a unix_username (after being passed through mapping functions) - when doing security={server,domain} use the smb_username, otherwise use the unix_username (This used to be commit d34fd8ec0716127c7a68eeb8e77d1ae8cc07b547)
Diffstat (limited to 'source3/smbd/reply.c')
-rw-r--r--source3/smbd/reply.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index c2d38a1076..9e88f58fa6 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -462,7 +462,7 @@ static int session_trust_account(connection_struct *conn, char *inbuf, char *out
smb_username.str = user;
smb_username.len = strlen(smb_username.str);
- user_info.requested_username = smb_username; /* For the time-being */
+ user_info.unix_username = smb_username; /* For the time-being */
user_info.smb_username = smb_username;
user_info.wksta_name = wksta_name;
@@ -776,7 +776,8 @@ int reply_sesssetup_and_X(connection_struct *conn, char *inbuf,char *outbuf,int
add_session_user(user);
if (!guest) {
- valid_password = NT_STATUS_IS_OK(pass_check_smb(user, domain,
+ valid_password = NT_STATUS_IS_OK(pass_check_smb(orig_user, user,
+ domain,
(unsigned char *)smb_apasswd,
smb_apasslen,
(unsigned char *)smb_ntpasswd,