sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-30 19:42:05 +03:00
Code Activity

auth3: Simplify auth_check_ntlm_password logic with a "goto fail"

Browse Source 
No intended code change, just reformatting and a goto fail with
inverted logic

Best viewed with "git show -b" :-)

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke
2017-02-11 11:38:56 +01:00
committed by Jeremy Allison
parent 56b0303a61
commit 66f94e557e
1 changed files with 43 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
source3/auth/auth.c
View File

@ -257,55 +257,58 @@ NTSTATUS auth_check_ntlm_password(TALLOC_CTX *mem_ctx,
/* successful authentication */ /* successful authentication */
if (NT_STATUS_IS_OK(nt_status)) { if (!NT_STATUS_IS_OK(nt_status)) {
unix_username = server_info->unix_name; goto fail;
}
/* We skip doing this step if the caller asked us not to */ unix_username = server_info->unix_name;
if (!(user_info->flags & USER_INFO_INFO3_AND_NO_AUTHZ)
&& !(server_info->guest)) {
const char *rhost;
if (tsocket_address_is_inet(user_info->remote_host, "ip")) { /* We skip doing this step if the caller asked us not to */
rhost = tsocket_address_inet_addr_string(user_info->remote_host, if (!(user_info->flags & USER_INFO_INFO3_AND_NO_AUTHZ)
talloc_tos()); && !(server_info->guest)) {
if (rhost == NULL) { const char *rhost;
nt_status = NT_STATUS_NO_MEMORY;
goto fail; if (tsocket_address_is_inet(user_info->remote_host, "ip")) {
} rhost = tsocket_address_inet_addr_string(
} else { user_info->remote_host, talloc_tos());
rhost = "127.0.0.1"; if (rhost == NULL) {
nt_status = NT_STATUS_NO_MEMORY;
goto fail;
} }
} else {
/* We might not be root if we are an RPC call */ rhost = "127.0.0.1";
become_root();
nt_status = smb_pam_accountcheck(unix_username,
rhost);
unbecome_root();
if (NT_STATUS_IS_OK(nt_status)) {
DEBUG(5, ("check_ntlm_password: PAM Account for user [%s] succeeded\n",
unix_username));
} else {
DEBUG(3, ("check_ntlm_password: PAM Account for user [%s] FAILED with error %s\n",
unix_username, nt_errstr(nt_status)));
}
} }
/* We might not be root if we are an RPC call */
become_root();
nt_status = smb_pam_accountcheck(unix_username, rhost);
unbecome_root();
if (NT_STATUS_IS_OK(nt_status)) { if (NT_STATUS_IS_OK(nt_status)) {
DEBUG(server_info->guest ? 5 : 2, DEBUG(5, ("check_ntlm_password: PAM Account for user [%s] "
("check_ntlm_password: %sauthentication for user [%s] -> [%s] -> [%s] succeeded\n", "succeeded\n", unix_username));
server_info->guest ? "guest " : "", } else {
user_info->client.account_name, DEBUG(3, ("check_ntlm_password: PAM Account for user [%s] "
user_info->mapped.account_name, "FAILED with error %s\n",
unix_username)); unix_username, nt_errstr(nt_status)));
*pserver_info = talloc_move(mem_ctx, &server_info);
} }
TALLOC_FREE(frame);
return nt_status;
} }
if (NT_STATUS_IS_OK(nt_status)) {
DEBUG(server_info->guest ? 5 : 2,
("check_ntlm_password: %sauthentication for user "
"[%s] -> [%s] -> [%s] succeeded\n",
server_info->guest ? "guest " : "",
user_info->client.account_name,
user_info->mapped.account_name,
unix_username));
*pserver_info = talloc_move(mem_ctx, &server_info);
}
TALLOC_FREE(frame);
return nt_status;
fail: fail:
/* failed authentication; check for guest lapping */ /* failed authentication; check for guest lapping */