Changeset 140 for branches/samba-3.0/source/nsswitch/winbindd_dual.c

Timestamp:

07/11/08 01:13:42 (5 months ago)

Author:

psmedley

Message:

Update branch to 3.0.31 release

Files:

• branches/samba-3.0/source/nsswitch/winbindd_dual.c (modified) (6 diffs)

branches/samba-3.0/source/nsswitch/winbindd_dual.c

@@ -36 +36 @@
 
 extern BOOL override_logfile;
-extern struct winbindd_methods cache_methods;
 
 /* Read some data from a client connection */
@@ -888 +887 @@
         struct winbindd_cli_state state;
         struct winbindd_domain *domain;
+        struct winbindd_domain *primary_domain = NULL;
 
         if (socketpair(AF_UNIX, SOCK_STREAM, 0, fdpair) != 0) {
@@ -967 +967 @@
 
         /* Ensure we have no pending check_online events other
-           than one for this domain. */
+           than one for this domain or the primary domain. */
 
         for (domain = domain_list(); domain; domain = domain->next) {
-                if (domain != child->domain) {
+                if (domain->primary) {
+                        primary_domain = domain;
+                }
+                if ((domain != child->domain) && !domain->primary) {
                         TALLOC_FREE(domain->check_online_event);
                 }
@@ -986 +989 @@
 
                 set_domain_online_request(child->domain);
+
+                if (primary_domain != child->domain) {
+                        /* We need to talk to the primary
+                         * domain as well as the trusted
+                         * domain inside a trusted domain
+                         * child.
+                         * See the code in :
+                         * winbindd_dual_pam_auth_samlogon()
+                         * especially the calling of 
+                         * contact_domain = find_our_domain()
+                         * in the non-DC case for details.
+                         */
+                        set_domain_online_request(primary_domain);
+                }
 
                 child->lockout_policy_event = event_add_timed(
@@ -994 +1011 @@
         }
 
-        /* Special case for Winbindd on a Samba DC,
-         * We want to make sure the child can connect to smbd
-         * but not the main daemon */
-
-        if (child->domain && child->domain->internal && IS_DC) {
-                child->domain->methods = &cache_methods;
-                child->domain->online = False;
-        }
-
         while (1) {
 
@@ -1016 +1024 @@
 
                 /* check for signals */
-                winbind_check_sigterm();
+                winbind_check_sigterm(false);
                 winbind_check_sighup();