r23426: Correct a comment. The default timeout is not 1min, but 30s. While

there, do some reformatting.

Jeremy, I think we should also kill the child. It might hang in
something (an fcntl lock for example) that the next child might run into
immediately again.
(This used to be commit 6729a4df4b57f638161ec55f9b1edd0bc8bb947e)

diff --git a/source3/nsswitch/winbindd_dual.c b/source3/nsswitch/winbindd_dual.c
index 54525f8da1f64dd9596953118f97fdbbdfd60617..0c8491084d4b2ab10428e30838a07710b5ed5716 100644 (file)
--- a/source3/nsswitch/winbindd_dual.c
+++ b/source3/nsswitch/winbindd_dual.c
@@ -192,7 +192,7 @@ static void async_request_timeout_handler(struct event_context *ctx,
 
 static void async_request_sent(void *private_data_data, BOOL success)
 {
-       uint32_t timeout = 30;
+       uint32_t timeout;
        struct winbindd_async_request *state =
                talloc_get_type_abort(private_data_data, struct winbindd_async_request);
 
@@ -212,31 +212,35 @@ static void async_request_sent(void *private_data_data, BOOL success)
                         sizeof(state->response->result),
                         async_reply_recv, state);
 
-       /* 
-        * Normal timeouts are 30s, but auth requests may take a long
-        * time to timeout.
-        */
+       timeout = 30;
 
-       if (state->request->cmd == WINBINDD_PAM_AUTH ||
-                       state->request->cmd == WINBINDD_PAM_AUTH_CRAP ) {
+       if (state->request->cmd == WINBINDD_PAM_AUTH
+           || state->request->cmd == WINBINDD_PAM_AUTH_CRAP ) {
+
+               /* 
+                * Normal timeouts are 30s, but auth requests may take a long
+                * time to timeout.
+                */
 
                timeout = 300;
        }
 
        /* 
-        * Set up a timeout of 1 minute for the response.
-        * If we don't get it close the child socket and
-        * report failure.
+        * Set up a timeout of for the response. If we don't get it close the
+        * child socket and report failure.
         */
 
-       state->reply_timeout_event = event_add_timed(winbind_event_context(),
-                                                       NULL,
-                                                       timeval_current_ofs(timeout,0),
-                                                       "async_request_timeout",
-                                                       async_request_timeout_handler,
-                                                       state);
+       state->reply_timeout_event = event_add_timed(
+               winbind_event_context(),
+               NULL,
+               timeval_current_ofs(timeout,0),
+               "async_request_timeout",
+               async_request_timeout_handler,
+               state);
+
        if (!state->reply_timeout_event) {
-               smb_panic("async_request_sent: failed to add timeout handler.\n");
+               smb_panic("async_request_sent: failed to add timeout "
+                         "handler.\n");
        }
 }