Index: source3/winbindd/winbindd_msrpc.c
===================================================================
--- source3/winbindd/winbindd_msrpc.c.orig
+++ source3/winbindd/winbindd_msrpc.c
@@ -1098,7 +1098,7 @@ NTSTATUS winbindd_lookup_sids(TALLOC_CTX
 	 * allow the server to time out.
 	 * 35 seconds should do it.
 	 */
-	orig_timeout = dcerpc_binding_handle_set_timeout(b, 35000);
+	orig_timeout = dcerpc_binding_handle_set_timeout(b, lp_winbind_rpc_timeout());
 
 	status = dcerpc_lsa_lookup_sids_generic(b,
 						mem_ctx,
Index: source3/param/loadparm.c
===================================================================
--- source3/param/loadparm.c.orig
+++ source3/param/loadparm.c
@@ -216,6 +216,7 @@ struct global {
 	bool bWinbindOfflineLogon;
 	bool bWinbindNormalizeNames;
 	bool bWinbindRpcOnly;
+	int  bWinbindRpcTimeout;
 	bool bCreateKrb5Conf;
 	int winbindMaxDomainConnections;
 	char *szIdmapBackend;
@@ -4803,6 +4804,15 @@ static struct parm_struct parm_table[] =
 		.flags		= FLAG_ADVANCED,
 	},
 	{
+		.label		= "winbind rpc timeout",
+		.type		= P_INTEGER,
+		.p_class	= P_GLOBAL,
+		.ptr		= &Globals.bWinbindRpcTimeout,
+		.special	= NULL,
+		.enum_list	= NULL,
+		.flags		= FLAG_ADVANCED,
+	},
+	{
 		.label		= "create krb5 conf",
 		.type		= P_BOOL,
 		.p_class	= P_GLOBAL,
@@ -5475,6 +5485,7 @@ static void init_globals(bool reinit_glo
 	Globals.szWinbindNssInfo = str_list_make_v3(NULL, "template", NULL);
 	Globals.bWinbindRefreshTickets = False;
 	Globals.bWinbindOfflineLogon = False;
+	Globals.bWinbindRpcTimeout = 35000;
 
 	Globals.iIdmapCacheTime = 86400 * 7; /* a week by default */
 	Globals.iIdmapNegativeCacheTime = 120; /* 2 minutes by default */
@@ -5756,6 +5767,7 @@ FN_GLOBAL_BOOL(lp_winbind_refresh_ticket
 FN_GLOBAL_BOOL(lp_winbind_offline_logon, &Globals.bWinbindOfflineLogon)
 FN_GLOBAL_BOOL(lp_winbind_normalize_names, &Globals.bWinbindNormalizeNames)
 FN_GLOBAL_BOOL(lp_winbind_rpc_only, &Globals.bWinbindRpcOnly)
+FN_GLOBAL_INTEGER(lp_winbind_rpc_timeout, &Globals.bWinbindRpcTimeout)
 FN_GLOBAL_BOOL(lp_create_krb5_conf, &Globals.bCreateKrb5Conf)
 static FN_GLOBAL_INTEGER(lp_winbind_max_domain_connections_int,
 		  &Globals.winbindMaxDomainConnections)