From: Günther Deschner Date: Thu, 12 Sep 2019 14:39:10 +0000 (+0200) Subject: s3-winbindd: fix forest trusts with additional trust attributes. X-Git-Tag: talloc-2.3.1~761 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d78c87e665e23e6470a19a69383ede7137172c26;p=thirdparty%2Fsamba.git s3-winbindd: fix forest trusts with additional trust attributes. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14130 Guenther Signed-off-by: Guenther Deschner Reviewed-by: Stefan Metzmacher Reviewed-by: Andreas Schneider --- diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c index 5f20cfb7f76..485ca831be9 100644 --- a/source3/winbindd/winbindd_ads.c +++ b/source3/winbindd/winbindd_ads.c @@ -1457,7 +1457,7 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain, */ if ((trust->trust_attributes - == LSA_TRUST_ATTRIBUTE_QUARANTINED_DOMAIN) && + & LSA_TRUST_ATTRIBUTE_QUARANTINED_DOMAIN) && !domain->primary ) { DEBUG(10,("trusted_domains: Skipping external trusted " diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c index ebe283ec712..f51fa7efe06 100644 --- a/source3/winbindd/winbindd_util.c +++ b/source3/winbindd/winbindd_util.c @@ -723,7 +723,7 @@ static void rescan_forest_trusts( void ) if ( (flags & NETR_TRUST_FLAG_INBOUND) && (type == LSA_TRUST_TYPE_UPLEVEL) && - (attribs == LSA_TRUST_ATTRIBUTE_FOREST_TRANSITIVE) ) + (attribs & LSA_TRUST_ATTRIBUTE_FOREST_TRANSITIVE) ) { /* add the trusted domain if we don't know about it */