svn commit: samba r19500 - in branches/SAMBA_3_0_23/source/nsswitch: .

[gd at samba.org]

Author: gd
Date: 2006-10-26 20:14:59 +0000 (Thu, 26 Oct 2006)
New Revision: 19500

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19500

Log:
Merge -r19254 from 3_0

Guenther

Modified:
   branches/SAMBA_3_0_23/source/nsswitch/winbindd_misc.c


Changeset:
Modified: branches/SAMBA_3_0_23/source/nsswitch/winbindd_misc.c
===================================================================
--- branches/SAMBA_3_0_23/source/nsswitch/winbindd_misc.c	2006-10-26 14:57:11 UTC (rev 19499)
+++ branches/SAMBA_3_0_23/source/nsswitch/winbindd_misc.c	2006-10-26 20:14:59 UTC (rev 19500)
@@ -190,6 +190,7 @@
 	struct rpc_pipe_client *netlogon_pipe;
 	NTSTATUS result;
 	WERROR werr;
+	unsigned int orig_timeout;
 
 	state->request.domain_name
 		[sizeof(state->request.domain_name)-1] = '\0';
@@ -204,9 +205,16 @@
 		return WINBINDD_ERROR;
 	}
 
+	/* This call can take a long time - allow the server to time out.
+	   35 seconds should do it. */
+
+	orig_timeout = cli_set_timeout(netlogon_pipe->cli, 35000);
+
 	werr = rpccli_netlogon_getdcname(netlogon_pipe, state->mem_ctx, domain->dcname,
 					   state->request.domain_name,
 					   dcname_slash);
+	/* And restore our original timeout. */
+	cli_set_timeout(netlogon_pipe->cli, orig_timeout);
 
 	if (!W_ERROR_IS_OK(werr)) {
 		DEBUG(5, ("Error requesting DCname: %s\n", dos_errstr(werr)));