Changeset 232 for branches/samba-3.2.x/source/winbindd/winbindd_util.c

Timestamp:

May 27, 2009, 9:09:42 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.8

File:

• branches/samba-3.2.x/source/winbindd/winbindd_util.c (modified) (2 diffs)

branches/samba-3.2.x/source/winbindd/winbindd_util.c

@@ -507 +507 @@
 {
         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... */
         
@@ -763 +767 @@
         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 )