From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 15 Jan 2018 11:06:50 +0000 (+0100)
Subject: winbindd: prepare find_auth_domain() transitive trusts on a DC
X-Git-Tag: tevent-0.9.36~169
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=af9a37aa1925a18709365ceb93460d8ae0f66f51;p=thirdparty%2Fsamba.git

winbindd: prepare find_auth_domain() transitive trusts on a DC

Bug: https://bugzilla.samba.org/show_bug.cgi?id=13235

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index 52a24efc531..a14b801cb94 100644
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -395,8 +395,14 @@ struct winbindd_domain *find_auth_domain(uint8_t flags,
 			DEBUG(3, ("Authentication for domain [%s] refused "
 				  "as it is not a trusted domain\n",
 				  domain_name));
+			return NULL;
 		}
-		return domain;
+
+		if (domain->secure_channel_type != SEC_CHAN_NULL) {
+			return domain;
+		}
+
+		return domain->routing_domain;
 	}
 
 	if (strequal(domain_name, get_global_sam_name())) {