Changeset 232 for branches/samba-3.2.x/source/winbindd/winbindd_cm.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_cm.c (modified) (7 diffs)

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

@@ -174 +174 @@
         pid_t child_pid;
         pid_t parent_pid = sys_getpid();
+        char *lfile = NULL;
 
         /* Stop zombies */
@@ -200 +201 @@
         /* Leave messages blocked - we will never process one. */
 
-        if (!reinit_after_fork(winbind_messaging_context(), true)) {
+        if (!override_logfile) {
+                if (asprintf(&lfile, "%s/log.winbindd-dc-connect", get_dyn_LOGFILEBASE()) == -1) {
+                        DEBUG(0, ("fork_child_dc_connect: out of memory!\n"));
+                        _exit(1);
+                }
+        }
+
+        if (!winbindd_reinit_after_fork(lfile)) {
                 DEBUG(0,("reinit_after_fork() failed\n"));
-                _exit(0);
-        }
-
-        close_conns_after_fork();
-
-        if (!override_logfile) {
-                char *logfile;
-                if (asprintf(&logfile, "%s/log.winbindd-dc-connect", get_dyn_LOGFILEBASE()) > 0) {
-                        lp_set_logfile(logfile);
-                        SAFE_FREE(logfile);
-                        reopen_logs();
-                }
-        }
+                messaging_send_buf(winbind_messaging_context(),
+                                   pid_to_procid(parent_pid),
+                                   MSG_WINBIND_FAILED_TO_GO_ONLINE,
+                                   (uint8 *)domain->name,
+                                   strlen(domain->name) + 1);
+                _exit(1);
+        }
+
+        SAFE_FREE(lfile);
 
         mem_ctx = talloc_init("fork_child_dc_connect");
         if (!mem_ctx) {
                 DEBUG(0,("talloc_init failed.\n"));
-                _exit(0);
+                _exit(1);
         }
 
@@ -378 +382 @@
 ****************************************************************/
 
+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",
@@ -400 +405 @@
 
         /* 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... */
         domain->startup = False;
@@ -475 +478 @@
            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) {
                 /* If we've come from being globally offline we
@@ -480 +490 @@
                    We need to add one now we're trying to go
                    back online. */
-
                 DEBUG(10,("set_domain_online_request: domain %s was globally offline.\n",
                         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");
-                }
-        }
-
-        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");
+        }
 }
 
@@ -613 +614 @@
                                                   &domain_info,
                                                   &werr);
-                if (W_ERROR_IS_OK(werr)) {
+                if (NT_STATUS_IS_OK(result) && W_ERROR_IS_OK(werr)) {
                         tmp = talloc_strdup(
                                 mem_ctx, domain_info->dc_unc);