Changeset 165 for branches/samba-3.0/source/nsswitch/winbindd_dual.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_dual.c (modified) (13 diffs)

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

@@ -195 +195 @@
         TALLOC_FREE(state->reply_timeout_event);
 
-        SMB_ASSERT(state->child_pid != (pid_t)0);
-
-        /* If not already reaped, send kill signal to child. */
-        if (state->child->pid == state->child_pid) {
+        /* If child exists and is not already reaped,
+           send kill signal to child. */
+
+        if ((state->child->pid != (pid_t)0) &&
+                        (state->child->pid != (pid_t)-1) &&
+                        (state->child->pid == state->child_pid)) {
                 kill(state->child_pid, SIGTERM);
 
@@ -293 +295 @@
         }
 
+        /*
+         * This may be a reschedule, so we might
+         * have an existing timeout event pending on
+         * the first entry in the child->requests list
+         * (we only send one request at a time).
+         * Ensure we free it before we reschedule.
+         * Bug #5814, from hargagan <shargagan@novell.com>.
+         * JRA.
+         */
+
+        TALLOC_FREE(request->reply_timeout_event);
+
         if ((child->pid == 0) && (!fork_domain_child(child))) {
-                /* Cancel all outstanding requests */
+                /* fork_domain_child failed.
+                   Cancel all outstanding requests */
 
                 while (request != NULL) {
                         /* request might be free'd in the continuation */
                         struct winbindd_async_request *next = request->next;
-                        request->continuation(request->private_data, False);
+
+                        async_request_fail(request);
                         request = next;
                 }
@@ -536 +552 @@
         child->pid = 0;
 
+        if (child->requests) {
+                /*
+                 * schedule_async_request() will also
+                 * clear this event but the call is
+                 * idempotent so it doesn't hurt to
+                 * cover all possible future code
+                 * paths. JRA.
+                 */
+                TALLOC_FREE(child->requests->reply_timeout_event);
+        }
+
         schedule_async_request(child);
 }
@@ -753 +780 @@
 {
         struct winbindd_domain *domain;
+        struct winbindd_domain *primary_domain = NULL;
         const char *domainname = (const char *)buf;
 
@@ -772 +800 @@
         }
 
+        primary_domain = find_our_domain();
+
         /* Mark the requested domain offline. */
 
@@ -781 +811 @@
                         DEBUG(5,("child_msg_offline: marking %s offline.\n", domain->name));
                         set_domain_offline(domain);
+                        /* we are in the trusted domain, set the primary domain 
+                         * offline too */
+                        if (domain != primary_domain) {
+                                set_domain_offline(primary_domain);
+                        }
                 }
         }
@@ -791 +826 @@
 {
         struct winbindd_domain *domain;
+        struct winbindd_domain *primary_domain = NULL;
         const char *domainname = (const char *)buf;
 
@@ -803 +839 @@
                 return;
         }
+
+        primary_domain = find_our_domain();
 
         /* Set our global state as online. */
@@ -818 +856 @@
                         winbindd_flush_negative_conn_cache(domain);
                         set_domain_online_request(domain);
+
+                        /* we can be in trusted domain, which will contact primary domain
+                         * we have to bring primary domain online in trusted domain process
+                         * see, winbindd_dual_pam_auth() --> winbindd_dual_pam_auth_samlogon()
+                         * --> contact_domain = find_our_domain()
+                         * */
+                        if (domain != primary_domain) {
+                                winbindd_flush_negative_conn_cache(primary_domain);
+                                set_domain_online_request(primary_domain);
+                        }
                 }
         }
@@ -881 +929 @@
 }
 
+bool reinit_after_fork(struct messaging_context *msg_ctx,
+                        struct event_context *ev_ctx,
+                        bool parent_longlived);
+void ccache_remove_all_after_fork(void);
+
+bool winbindd_reinit_after_fork(const char *logfile)
+{
+        struct winbindd_domain *dom;
+        struct winbindd_child *cl;
+
+        if (!reinit_after_fork(NULL,
+                                winbind_event_context(), true)) {
+                DEBUG(0, ("reinit_after_fork failed.\n"));
+                return false;
+        }
+
+        close_conns_after_fork();
+
+        if (!override_logfile && logfile) {
+                lp_set_logfile(logfile);
+                reopen_logs();
+        }
+
+        /* Don't handle the same messages as our parent. */
+        message_deregister(MSG_SMB_CONF_UPDATED);
+        message_deregister(MSG_SHUTDOWN);
+        message_deregister(MSG_WINBIND_OFFLINE);
+        message_deregister(MSG_WINBIND_ONLINE);
+        message_deregister(MSG_WINBIND_ONLINESTATUS);
+
+        ccache_remove_all_after_fork();
+        
+        for (dom = domain_list(); dom; dom = dom->next) {
+                TALLOC_FREE(dom->check_online_event);
+        }
+
+        for (cl = children; cl; cl = cl->next) {
+                struct winbindd_async_request *request;
+
+                for (request = cl->requests; request; request = request->next) {
+                        TALLOC_FREE(request->reply_timeout_event);
+                }
+                TALLOC_FREE(cl->lockout_policy_event);
+        }
+
+        return true;
+}
+
 static BOOL fork_domain_child(struct winbindd_child *child)
 {
         int fdpair[2];
         struct winbindd_cli_state state;
-        struct winbindd_domain *domain;
         struct winbindd_domain *primary_domain = NULL;
 
@@ -916 +1011 @@
                 child->event.fd = fdpair[1];
                 child->event.flags = 0;
-                child->requests = NULL;
                 add_fd_event(&child->event);
                 /* We're ok with online/offline messages now. */
@@ -932 +1026 @@
 
         /* tdb needs special fork handling */
-        if (tdb_reopen_all(1) == -1) {
-                DEBUG(0,("tdb_reopen_all failed.\n"));
+        if (!winbindd_reinit_after_fork(child->logfilename)) {
+                DEBUG(0, ("winbindd_reinit_after_fork failed.\n"));
                 _exit(0);
         }
-
-        close_conns_after_fork();
-
-        if (!override_logfile) {
-                lp_set_logfile(child->logfilename);
-                reopen_logs();
-        }
-
-        /* Don't handle the same messages as our parent. */
-        message_deregister(MSG_SMB_CONF_UPDATED);
-        message_deregister(MSG_SHUTDOWN);
-        message_deregister(MSG_WINBIND_OFFLINE);
-        message_deregister(MSG_WINBIND_ONLINE);
-        message_deregister(MSG_WINBIND_ONLINESTATUS);
 
         /* The child is ok with online/offline messages now. */
@@ -960 +1040 @@
                          NULL);
 
+        primary_domain = find_our_domain();
+
+        if (primary_domain == NULL) {
+                smb_panic("no primary domain found");
+        }
+
+        /* It doesn't matter if we allow cache login,
+         * try to bring domain online after fork. */
         if ( child->domain ) {
                 child->domain->startup = True;
                 child->domain->startup_time = time(NULL);
-        }
-
-        /* Ensure we have no pending check_online events other
-           than one for this domain or the primary domain. */
-
-        for (domain = domain_list(); domain; domain = domain->next) {
-                if (domain->primary) {
-                        primary_domain = domain;
-                }
-                if ((domain != child->domain) && !domain->primary) {
-                        TALLOC_FREE(domain->check_online_event);
-                }
-        }
-
-        /* Ensure we're not handling an event inherited from
-           our parent. */
-
-        cancel_named_event(winbind_event_context(),
-                           "krb5_ticket_refresh_handler");
+                /* we can be in primary domain or in trusted domain
+                 * If we are in trusted domain, set the primary domain
+                 * in start-up mode */
+                if (!(child->domain->internal)) {
+                        set_domain_online_request(child->domain);
+                        if (!(child->domain->primary)) {
+                                primary_domain->startup = True;
+                                primary_domain->startup_time = time(NULL);
+                                set_domain_online_request(primary_domain);
+                        }
+                }
+        }
 
         /* We might be in the idmap child...*/