sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

s3:smbd: inline check_guest_password() into reply_sesssetup_and_X()

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Stefan Metzmacher 2017-06-18 12:08:58 +02:00
parent 5810f7468b
commit c990d2bd1c
1 changed files with 25 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
source3/smbd/sesssetup.c
View File

@ -74,45 +74,6 @@ static int push_signature(uint8_t **outbuf)
return result; return result;
} }
/****************************************************************************
Do a 'guest' logon, getting back the
****************************************************************************/
static NTSTATUS check_guest_password(const struct tsocket_address *remote_address,
const struct tsocket_address *local_address,
TALLOC_CTX *mem_ctx,
struct auth_session_info **session_info)
{
struct auth4_context *auth_context;
struct auth_usersupplied_info *user_info = NULL;
uint8_t chal[8];
NTSTATUS nt_status;
DEBUG(3,("Got anonymous request\n"));
nt_status = make_auth4_context(talloc_tos(), &auth_context);
if (!NT_STATUS_IS_OK(nt_status)) {
return nt_status;
}
auth_context->get_ntlm_challenge(auth_context,
chal);
if (!make_user_info_guest(talloc_tos(), remote_address, local_address,
"SMB", &user_info)) {
TALLOC_FREE(auth_context);
return NT_STATUS_NO_MEMORY;
}
user_info->auth_description = "guest";
nt_status = auth_check_password_session_info(auth_context,
mem_ctx, user_info, session_info);
TALLOC_FREE(user_info);
TALLOC_FREE(auth_context);
return nt_status;
}
/**************************************************************************** /****************************************************************************
Reply to a session setup command. Reply to a session setup command.
conn POINTER CAN BE NULL HERE ! conn POINTER CAN BE NULL HERE !
@ -885,11 +846,33 @@ void reply_sesssetup_and_X(struct smb_request *req)
reload_services(sconn, conn_snum_used, true); reload_services(sconn, conn_snum_used, true);
if (!*user) { if (!*user) {
struct auth4_context *auth_context = NULL;
nt_status = check_guest_password(sconn->remote_address, DEBUG(3,("Got anonymous request\n"));
sconn->local_address,
req, &session_info);
nt_status = make_auth4_context(talloc_tos(), &auth_context);
if (NT_STATUS_IS_OK(nt_status)) {
uint8_t chal[8];
auth_context->get_ntlm_challenge(auth_context,
chal);
if (!make_user_info_guest(talloc_tos(),
sconn->remote_address,
sconn->local_address,
"SMB", &user_info)) {
nt_status = NT_STATUS_NO_MEMORY;
}
if (NT_STATUS_IS_OK(nt_status)) {
user_info->auth_description = "guest";
nt_status = auth_check_password_session_info(
auth_context,
req, user_info,
&session_info);
}
TALLOC_FREE(auth_context);
}
} else if (doencrypt) { } else if (doencrypt) {
struct auth4_context *negprot_auth_context = NULL; struct auth4_context *negprot_auth_context = NULL;
negprot_auth_context = xconn->smb1.negprot.auth_context; negprot_auth_context = xconn->smb1.negprot.auth_context;