]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
winbindd: don't set mapped_state in winbindd_dual_auth_passdb()
authorStefan Metzmacher <metze@samba.org>
Thu, 3 Mar 2022 22:23:21 +0000 (23:23 +0100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 10 Mar 2022 03:16:35 +0000 (03:16 +0000)
mapped_state is a special hack for authenticate_ldap_simple_bind_send()
in order to avoid some additional work in authsam_check_password_internals()

This doesn't apply here. We should also handle wbinfo -a
authentication UPN names, e.g. administrator@DOMAIN,
even if the account belongs to the local sam.

With this change the behavior is consistent also locally on DCs and
also an RODC can handle these requests locally for cached accounts.

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

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
selftest/knownfail.d/samba.blackbox.wbinfo [deleted file]
source3/winbindd/winbindd_pam.c

diff --git a/selftest/knownfail.d/samba.blackbox.wbinfo b/selftest/knownfail.d/samba.blackbox.wbinfo
deleted file mode 100644 (file)
index fa71377..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-^samba.blackbox.wbinfo.ad_dc.*.wbinfo.-a.against.*.with.domain.upn.creds
-^samba.blackbox.wbinfo.promoted_dc.*.wbinfo.-a.against.*.with.domain.upn.creds
index ca89d48cb491c9ed0bb043335bb4cfc3a378fcf4..c2fcc399ab8b777cbfec59cd1cac0989a6ad2c6c 100644 (file)
@@ -1430,9 +1430,6 @@ static NTSTATUS winbindd_dual_auth_passdb(TALLOC_CTX *mem_ctx,
                return NT_STATUS_NO_MEMORY;
        }
 
-       /* We don't want any more mapping of the username */
-       user_info->mapped_state = True;
-
        /* We don't want to come back to winbindd or to do PAM account checks */
        user_info->flags |= USER_INFO_INFO3_AND_NO_AUTHZ;