[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3298-gccd63a2

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  ccd63a202b7978af3d6fdb46d1c17f0e9ac0fef6 (commit)
      from  5122f064d8d05b24c755506f4d7043c693670e80 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit ccd63a202b7978af3d6fdb46d1c17f0e9ac0fef6
Author: Gerald (Jerry) Carter <jerry at samba.org>
Date:   Mon Dec 22 11:07:08 2008 -0800

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

-----------------------------------------------------------------------

Summary of changes:
 source/winbindd/winbindd_util.c |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/winbindd/winbindd_util.c b/source/winbindd/winbindd_util.c
index a2a248b..624d68e 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;	


-- 
Samba Shared Repository