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>

diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c
index 5f20cfb7f7695e3b0d6321bea8ac9e23024cb127..485ca831be9616ccea32be806eefa123a2ed3802 100644 (file)
--- 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 ebe283ec71235c0c080957b6b77ac97083301dae..f51fa7efe061e29749514974f9709a8af6f2fe36 100644 (file)
--- 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 */