sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-06 13:18:07 +03:00
Code

s4:auth: rename user_info->mapped_state to user_info->cracknames_called

Browse Source 
This makes it much clearer what it is used for and
it is a special hack for authenticate_ldap_simple_bind_send()
in order to avoid some additional work in
authsam_check_password_internals().

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13879

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit 427125d182)
This commit is contained in:
Stefan Metzmacher 2022-03-03 11:10:00 +01:00 committed by Jule Anger
parent 8fa656cdee
commit f4179deb27
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
auth/common_auth.h
View File

@ -49,7 +49,7 @@ struct auth_usersupplied_info
uint32_t logon_parameters;
bool mapped_state;
bool cracknames_called;
bool was_mapped;
uint64_t logon_id;
/* the values the client gives us */

4
source4/auth/ntlm/auth_sam.c
View File

@ -658,7 +658,7 @@ static NTSTATUS authsam_check_password_internals(struct auth_method_context *ctx
* really, really want to get back to exactly the same account
* we got the DN for.
*/
if (user_info->mapped_state == false) {
if (!user_info->cracknames_called) {
p = strchr_m(account_name, '@');
} else {
/*
@ -867,7 +867,7 @@ static NTSTATUS authsam_want_check(struct auth_method_context *ctx,
return NT_STATUS_OK;
}
if (user_info->mapped_state) {
if (user_info->cracknames_called) {
/*
* The caller already did a cracknames call.
*/

2
source4/auth/ntlm/auth_simple.c
View File

@ -123,7 +123,7 @@ _PUBLIC_ struct tevent_req *authenticate_ldap_simple_bind_send(TALLOC_CTX *mem_c
user_info->mapped.account_name = nt4_username;
user_info->mapped.domain_name = nt4_domain;
user_info->mapped_state = true;
user_info->cracknames_called = true;
subreq = auth_check_password_send(state, ev,
state->auth_context,