Changeset 165 for branches/samba-3.0/source/nsswitch/winbindd_cm.c

Timestamp:

Mar 11, 2009, 9:14:55 AM (16 years ago)

Author:

Paul Smedley

Message:

Add 'missing' 3.0.34 diffs

File:

• branches/samba-3.0/source/nsswitch/winbindd_cm.c (modified) (7 diffs)

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

@@ -162 +162 @@
 ****************************************************************/
 
+bool winbindd_reinit_after_fork(const char *logfile);
+
 static BOOL fork_child_dc_connect(struct winbindd_domain *domain)
 {
@@ -169 +171 @@
         pid_t child_pid;
         pid_t parent_pid = sys_getpid();
+        pstring logfile;
 
         /* Stop zombies */
@@ -198 +201 @@
 
         /* tdb needs special fork handling */
-        if (tdb_reopen_all(1) == -1) {
-                DEBUG(0,("tdb_reopen_all failed.\n"));
+        if (!override_logfile) {
+                pstr_sprintf(logfile, "%s/log.winbindd-dc-connect", dyn_LOGFILEBASE);
+        }
+        if (!winbindd_reinit_after_fork(logfile)) {
+                DEBUG(0,("winbindd_reinit_after_fork failed.\n"));
+                message_send_pid(pid_to_procid(parent_pid), MSG_WINBIND_FAILED_TO_GO_ONLINE,
+                                domain->name,
+                                strlen(domain->name)+1, False);
                 _exit(0);
-        }
-
-        close_conns_after_fork();
-
-        if (!override_logfile) {
-                pstring logfile;
-                pstr_sprintf(logfile, "%s/log.winbindd-dc-connect", dyn_LOGFILEBASE);
-                lp_set_logfile(logfile);
-                reopen_logs();
         }
 
@@ -352 +352 @@
 ****************************************************************/
 
+void ccache_regain_all_now(void);
+
 static void set_domain_online(struct winbindd_domain *domain)
 {
-        struct timeval now;
-
         DEBUG(10,("set_domain_online: called for domain %s\n",
                 domain->name ));
@@ -372 +372 @@
 
         /* If we are waiting to get a krb5 ticket, trigger immediately. */
-        GetTimeOfDay(&now);
-        set_event_dispatch_time(winbind_event_context(),
-                                "krb5_ticket_gain_handler", now);
+        ccache_regain_all_now();
 
         /* Ok, we're out of any startup mode now... */
@@ -427 +425 @@
            because network manager seems to lie.
            Wait at least 5 seconds. Heuristics suck... */
+        GetTimeOfDay(&tev);
+
+        /* Go into "startup" mode again. */
+        domain->startup_time = tev.tv_sec;
+        domain->startup = True;
+
+        tev.tv_sec += 5;
 
         if (!domain->check_online_event) {
@@ -437 +442 @@
                         domain->name ));
 
-                domain->check_online_event = event_add_timed(winbind_event_context(),
-                                                                NULL,
-                                                                timeval_current_ofs(5, 0),
-                                                                "check_domain_online_handler",
-                                                                check_domain_online_handler,
-                                                                domain);
-
-                /* The above *has* to succeed for winbindd to work. */
-                if (!domain->check_online_event) {
-                        smb_panic("set_domain_online_request: failed to add online handler.\n");
-                }
-        }
-
-        GetTimeOfDay(&tev);
-
-        /* Go into "startup" mode again. */
-        domain->startup_time = tev.tv_sec;
-        domain->startup = True;
-
-        tev.tv_sec += 5;
-
-        set_event_dispatch_time(winbind_event_context(), "check_domain_online_handler", tev);
+        }
+        TALLOC_FREE(domain->check_online_event);
+        
+        domain->check_online_event = event_add_timed(winbind_event_context(),
+                                                        NULL,
+                                                        tev,
+                                                        "check_domain_online_handler",
+                                                        check_domain_online_handler,
+                                                        domain);
+
+        /* The above *has* to succeed for winbindd to work. */
+        if (!domain->check_online_event) {
+                smb_panic("set_domain_online_request: failed to add online handler.\n");
+        }
 }