summaryrefslogtreecommitdiff
path: root/source3/winbindd/winbindd_pam.c
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2018-01-15 12:06:50 +0100
committerRalph Boehme <slow@samba.org>2018-02-10 08:35:16 +0100
commitaf9a37aa1925a18709365ceb93460d8ae0f66f51 (patch)
treea6d99d2e5ff506c53eef83d54e6aaa2ea3fee79f /source3/winbindd/winbindd_pam.c
parentc5bd18c0021b428c669dbbc35f65a3d436b4add5 (diff)
downloadsamba-af9a37aa1925a18709365ceb93460d8ae0f66f51.tar.gz
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>
Diffstat (limited to 'source3/winbindd/winbindd_pam.c')
-rw-r--r--source3/winbindd/winbindd_pam.c8
1 files changed, 7 insertions, 1 deletions
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())) {