summaryrefslogtreecommitdiff
path: root/source3/auth
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2005-05-27 14:19:57 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:57:00 -0500
commitcc6df2e9cf5b31f83cf88d21457b32712d90f04b (patch)
treeb5073d729aba8fcb648067ae4a0c248b6efcc6b1 /source3/auth
parentaf52df2f1fde76b518bf946e396bc29869aa6964 (diff)
downloadsamba-cc6df2e9cf5b31f83cf88d21457b32712d90f04b.tar.gz
samba-cc6df2e9cf5b31f83cf88d21457b32712d90f04b.tar.bz2
samba-cc6df2e9cf5b31f83cf88d21457b32712d90f04b.zip
r7024: reverting mistaken commit
(This used to be commit c70c5c4ee9b14fbdb174f542607aceebe0e88470)
Diffstat (limited to 'source3/auth')
-rw-r--r--source3/auth/auth.c18
1 files changed, 5 insertions, 13 deletions
diff --git a/source3/auth/auth.c b/source3/auth/auth.c
index e38279a140..b777e97cc9 100644
--- a/source3/auth/auth.c
+++ b/source3/auth/auth.c
@@ -215,7 +215,6 @@ static NTSTATUS check_ntlm_password(const struct auth_context *auth_context,
if (!user_info || !auth_context || !server_info)
return NT_STATUS_LOGON_FAILURE;
-
DEBUG(3, ("check_ntlm_password: Checking password for unmapped user [%s]\\[%s]@[%s] with the new password interface\n",
user_info->client_domain.str, user_info->smb_name.str, user_info->wksta_name.str));
@@ -306,19 +305,12 @@ static NTSTATUS check_ntlm_password(const struct auth_context *auth_context,
unix_username));
}
}
+
if (!NT_STATUS_IS_OK(nt_status)) {
- if (lp_map_to_guest() == MAP_TO_GUEST_ON_VALID_DOMAIN_USER ){
- /*user_info->smb_name.str = lp_guestaccount();*/
- become_root();
- nt_status = smb_pam_accountcheck(lp_guestaccount());
- unbecome_root();
- make_server_info_guest(server_info);
- }else{
- DEBUG(2, ("check_ntlm_password: Authentication for user [%s] -> [%s] FAILED with error %s\n",
- user_info->smb_name.str, user_info->internal_username.str,
- nt_errstr(nt_status)));
- ZERO_STRUCTP(server_info);
- }
+ DEBUG(2, ("check_ntlm_password: Authentication for user [%s] -> [%s] FAILED with error %s\n",
+ user_info->smb_name.str, user_info->internal_username.str,
+ nt_errstr(nt_status)));
+ ZERO_STRUCTP(server_info);
}
return nt_status;
}