From ccd63a202b7978af3d6fdb46d1c17f0e9ac0fef6 Mon Sep 17 00:00:00 2001
From: "Gerald (Jerry) Carter" <jerry@samba.org>
Date: Mon, 22 Dec 2008 11:07:08 -0800
Subject: [PATCH] Fix "allow trusted domain" so it disables trusted domains.

---
 source/winbindd/winbindd_util.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/source/winbindd/winbindd_util.c b/source/winbindd/winbindd_util.c
index a2a248b6821..624d68e04bf 100644
--- a/source/winbindd/winbindd_util.c
+++ b/source/winbindd/winbindd_util.c
@@ -506,7 +506,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) &&
@@ -762,7 +766,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;	
-- 
2.34.1