From 71049533ffc6a493390cf258b58ce900d5119646 Mon Sep 17 00:00:00 2001 From: Bo Yang Date: Fri, 4 Dec 2009 12:53:38 +0800 Subject: [PATCH] s3: Fix crash in winbindd;(bug#6879). Signed-off-by: Bo Yang (cherry picked from commit cdb68bd2b61147df77b7f2de3fb4e29be07e7bd9) --- source3/winbindd/winbindd_rpc.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c index f176fb3..d64b318 100644 --- a/source3/winbindd/winbindd_rpc.c +++ b/source3/winbindd/winbindd_rpc.c @@ -1283,8 +1283,12 @@ NTSTATUS winbindd_lookup_names(TALLOC_CTX *mem_ctx, * This call can take a long time * allow the server to time out. * 35 seconds should do it. + * NB + * only do this when the undelying transport is named pipe. */ - orig_timeout = rpccli_set_timeout(cli, 35000); + if (cli->transport->transport == NCACN_NP) { + orig_timeout = rpccli_set_timeout(cli, 35000); + } status = lookup_names_fn(cli, mem_ctx, @@ -1297,7 +1301,9 @@ NTSTATUS winbindd_lookup_names(TALLOC_CTX *mem_ctx, types); /* And restore our original timeout. */ - rpccli_set_timeout(cli, orig_timeout); + if (cli->transport->transport == NCACN_NP) { + rpccli_set_timeout(cli, orig_timeout); + } if (!NT_STATUS_IS_OK(status)) { return status; -- 1.5.3