Attachment 10128 Details for Bug 3204 – Fixed patch for 3.6.x

[patch] Fixed patch for 3.6.x

look (text/plain), 3.57 KB, created by Jeremy Allison on 2014-07-19 05:41:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2014-07-19 05:41:33 UTC

Size: 3.57 KB

patch

obsolete

>diff --git a/source3/include/proto.h b/source3/include/proto.h
>index 7303e76..9ef3517 100644
>--- a/source3/include/proto.h
>+++ b/source3/include/proto.h
>@@ -1696,6 +1696,7 @@ char lp_magicchar(const struct share_params *p );
> int lp_winbind_cache_time(void);
> int lp_winbind_reconnect_delay(void);
> int lp_winbind_max_clients(void);
>+int lp_winbind_request_timeout(void);
> const char **lp_winbind_nss_info(void);
> int lp_algorithmic_rid_base(void);
> int lp_name_cache_timeout(void);
>diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
>index dd63339..c4b3191 100644
>--- a/source3/param/loadparm.c
>+++ b/source3/param/loadparm.c
>@@ -266,6 +266,7 @@ struct global {
> 	int winbind_cache_time;
> 	int winbind_reconnect_delay;
> 	int winbind_max_clients;
>+	int winbind_request_timeout;
> 	char **szWinbindNssInfo;
> 	int iLockSpinTime;
> 	char *szLdapMachineSuffix;
>@@ -4772,6 +4773,15 @@ static struct parm_struct parm_table[] = {
> 		.flags		= FLAG_ADVANCED,
> 	},
> 	{
>+		.label		= "winbind request timeout",
>+		.type		= P_INTEGER,
>+		.p_class	= P_GLOBAL,
>+		.ptr		= &Globals.winbind_request_timeout,
>+		.special	= NULL,
>+		.enum_list	= NULL,
>+		.flags		= FLAG_ADVANCED,
>+	},
>+	{
> 		.label		= "create krb5 conf",
> 		.type		= P_BOOL,
> 		.p_class	= P_GLOBAL,
>@@ -5435,6 +5445,7 @@ static void init_globals(bool reinit_globals)
> 	Globals.winbind_cache_time = 300;	/* 5 minutes */
> 	Globals.winbind_reconnect_delay = 30;	/* 30 seconds */
> 	Globals.winbind_max_clients = 200;
>+	Globals.winbind_request_timeout = 60;	/* 60 seconds */
> 	Globals.bWinbindEnumUsers = False;
> 	Globals.bWinbindEnumGroups = False;
> 	Globals.bWinbindUseDefaultDomain = False;
>@@ -6052,6 +6063,7 @@ FN_LOCAL_CHAR(lp_magicchar, magic_char)
> FN_GLOBAL_INTEGER(lp_winbind_cache_time, &Globals.winbind_cache_time)
> FN_GLOBAL_INTEGER(lp_winbind_reconnect_delay, &Globals.winbind_reconnect_delay)
> FN_GLOBAL_INTEGER(lp_winbind_max_clients, &Globals.winbind_max_clients)
>+FN_GLOBAL_INTEGER(lp_winbind_request_timeout, &Globals.winbind_request_timeout)
> FN_GLOBAL_LIST(lp_winbind_nss_info, &Globals.szWinbindNssInfo)
> FN_GLOBAL_INTEGER(lp_algorithmic_rid_base, &Globals.AlgorithmicRidBase)
> FN_GLOBAL_INTEGER(lp_name_cache_timeout, &Globals.name_cache_timeout)
>diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
>index f447059..5f84685 100644
>--- a/source3/winbindd/winbindd.c
>+++ b/source3/winbindd/winbindd.c
>@@ -923,6 +923,41 @@ static bool remove_idle_client(void)
> 	return False;
> }
> 
>+/*
>+ * Terminate all clients whose requests have taken longer than
>+ * "winbind request timeout" seconds to process, or have been
>+ * idle for more than "winbind request timeout" seconds.
>+ */
>+
>+static void remove_timed_out_clients(void)
>+{
>+	struct winbindd_cli_state *state, *next = NULL;
>+	time_t curr_time = time(NULL);
>+	int timeout_val = lp_winbind_request_timeout();
>+
>+	for (state = winbindd_client_list(); state; state = next) {
>+		time_t expiry_time;
>+
>+		next = state->next;
>+		expiry_time = state->last_access + timeout_val;
>+
>+		if (curr_time > expiry_time) {
>+			if (client_is_idle(state)) {
>+				DEBUG(5,("Idle client timed out, "
>+					"shutting down sock %d, pid %u\n",
>+					state->sock,
>+					(unsigned int)state->pid));
>+			} else {
>+				DEBUG(5,("Client request timed out, "
>+					"shutting down sock %d, pid %u\n",
>+					state->sock,
>+					(unsigned int)state->pid));
>+			}
>+			remove_client(state);
>+		}
>+	}
>+}
>+
> struct winbindd_listen_state {
> 	bool privileged;
> 	int fd;
>@@ -948,6 +983,7 @@ static void winbindd_listen_fde_handler(struct tevent_context *ev,
> 			break;
> 		}
> 	}
>+	remove_timed_out_clients();
> 	new_connection(s->fd, s->privileged);
> }
>

Actions: View

Attachments on bug 3204: 2351 | 2353 | 2355 | 2747 | 10127 | 10128 | 10160