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

Timestamp:

Sep 30, 2008, 7:14:08 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.32

File:

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

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

@@ -103 +103 @@
 };
 
+static void async_request_fail(struct winbindd_async_request *state);
 static void async_main_request_sent(void *private_data, BOOL success);
 static void async_request_sent(void *private_data, BOOL success);
@@ -128 +129 @@
         state->mem_ctx = mem_ctx;
         state->child = child;
+        state->reply_timeout_event = NULL;
         state->request = request;
         state->response = response;
@@ -147 +149 @@
         if (!success) {
                 DEBUG(5, ("Could not send async request\n"));
-
-                state->response->length = sizeof(struct winbindd_response);
-                state->response->result = WINBINDD_ERROR;
-                state->continuation(state->private_data, False);
+                async_request_fail(state);
                 return;
         }
@@ -1025 +1024 @@
                 /* check for signals */
                 winbind_check_sigterm(false);
-                winbind_check_sighup();
+                winbind_check_sighup(override_logfile ? NULL :
+                        child->logfilename);
 
                 run_events(winbind_event_context(), 0, NULL, NULL);