Changeset 228 for branches/samba-3.2.x/source/winbindd/winbindd_dual.c

Timestamp:

May 26, 2009, 9:44:50 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.6

File:

• branches/samba-3.2.x/source/winbindd/winbindd_dual.c (modified) (5 diffs)

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

@@ -121 +121 @@
         SMB_ASSERT(continuation != NULL);
 
+        DEBUG(10, ("Sending request to child pid %d (domain=%s)\n",
+                (int)child->pid,
+                (child->domain != NULL) ? child->domain->name : "''"));
+
         state = TALLOC_P(mem_ctx, struct winbindd_async_request);
 
@@ -197 +201 @@
         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);
 
@@ -295 +301 @@
         }
 
+        /*
+         * 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;
                 }
@@ -487 +507 @@
         child->event.flags = 0;
         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);
@@ -1118 +1149 @@
                 set_domain_online_request(child->domain);
 
-                if (primary_domain != child->domain) {
+                if (primary_domain && (primary_domain != child->domain)) {
                         /* We need to talk to the primary
                          * domain as well as the trusted