sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

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

Browse Source 
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 6729a4df4b)
This commit is contained in:
Volker Lendecke 2007-06-12 08:02:32 +00:00 committed by Gerald (Jerry) Carter
parent 9ae6e51616
commit 501d97c653
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
source3/nsswitch/winbindd_dual.c
View File

@ -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");
}
}