diff options
| author | Günther Deschner <gd@samba.org> | 2019-09-12 16:39:10 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2019-10-15 10:26:18 +0000 |
| commit | d689042dffeb39d3200e90441b3f18023cab4369 (patch) | |
| tree | b658e20c2e7661cd6ee5281a4676be78e4077f0d | |
| parent | f19881f6198a006a281a11ea2f2952213c213e08 (diff) | |
| download | samba-d689042dffeb39d3200e90441b3f18023cab4369.tar.gz | |
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 <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit d78c87e665e23e6470a19a69383ede7137172c26)
| -rw-r--r-- | source3/winbindd/winbindd_ads.c | 2 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_util.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c index 204afdffb1f..922ca43764b 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 d266eb3048e..3245c70bb8e 100644 --- a/source3/winbindd/winbindd_util.c +++ b/source3/winbindd/winbindd_util.c @@ -698,7 +698,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 */ |