winbindd: allow wbinfo -a REALM\\user to work on a DC

find_domain_from_name_noinit() find the correct domain based
on domain->alt_name, but the child for the local domain
fails to detect that winbindd_dual_auth_passdb() should be
used.

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

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index a466015bcbfb7000cdf204687261cc5b9927c030..292f556e25babd590c25936c94e5b3b700e41270 100644 (file)
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -1564,7 +1564,16 @@ static NTSTATUS winbindd_dual_pam_auth_samlogon(TALLOC_CTX *mem_ctx,
 
        parse_domain_user(user, name_domain, name_user);
 
 
        parse_domain_user(user, name_domain, name_user);
 

-       if (strequal(name_domain, get_global_sam_name())) {
+       /*
+        * We check against domain->name instead of
+        * name_domain, as find_auth_domain() ->
+        * find_domain_from_name_noinit() already decided
+        * that we are in a child for the correct domain.
+        *
+        * name_domain can also be lp_realm()
+        * we need to check against domain->name.
+        */
+       if (strequal(domain->name, get_global_sam_name())) {

                DATA_BLOB chal_blob = data_blob_const(chal, sizeof(chal));
 
                /* do password magic */
                DATA_BLOB chal_blob = data_blob_const(chal, sizeof(chal));
 
                /* do password magic */


@@ -2004,7 +2013,16 @@ NTSTATUS winbind_dual_SamLogon(struct winbindd_domain *domain,
 {
        NTSTATUS result;
 
 {
        NTSTATUS result;
 

-       if (strequal(name_domain, get_global_sam_name())) {
+       /*
+        * We check against domain->name instead of
+        * name_domain, as find_auth_domain() ->
+        * find_domain_from_name_noinit() already decided
+        * that we are in a child for the correct domain.
+        *
+        * name_domain can also be lp_realm()
+        * we need to check against domain->name.
+        */
+       if (strequal(domain->name, get_global_sam_name())) {

                DATA_BLOB chal_blob = data_blob_const(
                        chal, 8);
 
                DATA_BLOB chal_blob = data_blob_const(
                        chal, 8);