From: Gerald (Jerry) Carter <jerry@samba.org>
Date: Mon, 22 Dec 2008 19:07:29 +0000 (-0800)
Subject: Fix "allow trusted domain" so it disables trusted domains.
X-Git-Tag: samba-4.0.0alpha6~413^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5aadfe29f07687fe47bcb23b36313e4fc6ada6ee;p=thirdparty%2Fsamba.git

Fix "allow trusted domain" so it disables trusted domains.
---

diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c
index fdfc8ed9d13..748099a32e5 100644
--- a/source3/winbindd/winbindd_util.c
+++ b/source3/winbindd/winbindd_util.c
@@ -540,7 +540,11 @@ static void rescan_forest_trusts( void )
 void rescan_trusted_domains( void )
 {
 	time_t now = time(NULL);
-	
+
+	/* Check that we allow trusted domains at all */
+	if (!lp_allow_trusted_domains())
+		return;
+
 	/* see if the time has come... */
 	
 	if ((now >= last_trustdom_scan) &&
@@ -796,7 +800,12 @@ void check_domain_trusted( const char *name, const DOM_SID *user_sid )
 	struct winbindd_domain *domain;	
 	DOM_SID dom_sid;
 	uint32 rid;
-	
+
+	/* Check if we even care */
+
+	if (!lp_allow_trusted_domains())
+		return;
+
 	domain = find_domain_from_name_noinit( name );
 	if ( domain )
 		return;