Revert this one: The NTLMv2 checks need the original username as found

on the wire.
(This used to be commit 7c9ae76b3ff4f1ba88ddad570648f32f99e38944)

diff --git a/source3/auth/auth_sam.c b/source3/auth/auth_sam.c
index 2427b2d16e43ed7d43375190d4b68a55ed7c8bc0..cb8d71177091954ef9e8e1011d14e5e129dacf4d 100644 (file)
--- a/source3/auth/auth_sam.c
+++ b/source3/auth/auth_sam.c
@@ -191,7 +191,7 @@ NTSTATUS smb_password_ok(SAM_ACCOUNT *sampass, const auth_usersupplied_info *use
                        if (smb_pwd_check_ntlmv2( user_info->nt_resp.buffer, 
                                                  user_info->nt_resp.len, 
                                                  nt_pw, 
-                                                 user_info->chal, sampass->username, 
+                                                 user_info->chal, user_info->smb_username.str, 
                                                  user_info->requested_domain.str,
                                                  (char *)server_info->session_key))
                        {

diff --git a/source3/smbd/auth_smbpasswd.c b/source3/smbd/auth_smbpasswd.c
index 2427b2d16e43ed7d43375190d4b68a55ed7c8bc0..cb8d71177091954ef9e8e1011d14e5e129dacf4d 100644 (file)
--- a/source3/smbd/auth_smbpasswd.c
+++ b/source3/smbd/auth_smbpasswd.c
@@ -191,7 +191,7 @@ NTSTATUS smb_password_ok(SAM_ACCOUNT *sampass, const auth_usersupplied_info *use
                        if (smb_pwd_check_ntlmv2( user_info->nt_resp.buffer, 
                                                  user_info->nt_resp.len, 
                                                  nt_pw, 
-                                                 user_info->chal, sampass->username, 
+                                                 user_info->chal, user_info->smb_username.str, 
                                                  user_info->requested_domain.str,
                                                  (char *)server_info->session_key))
                        {