From: NeilBrown <neilb@suse.de>
Date: Wed, 28 Nov 2012 19:35:25 +0000 (-0500)
Subject: gssd: base the size of the fd array on the RLIMIT_NOFILE limit.
X-Git-Tag: debian/1%1.2.8-1~11^2^2~46
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=7c5cb5e732a4b8704f8c79ec819c5d271e040339;p=nfs-utils.git

gssd: base the size of the fd array on the RLIMIT_NOFILE limit.

We have previously raised the size of the 'pollarray' once (32 -> 256)
and I have had another request to make it bigger.
Rather than changing the hard-coded value, make it depend on
RLIMIT_NOFILE.  This is an upper limit on the size of the array
that can be passed to poll() anyway.

Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Steve Dickson <steved@redhat.com>
---

diff --git a/utils/gssd/gssd_proc.c b/utils/gssd/gssd_proc.c
index 6f9840e..d01ba2f 100644
--- a/utils/gssd/gssd_proc.c
+++ b/utils/gssd/gssd_proc.c
@@ -52,6 +52,7 @@
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <sys/fsuid.h>
+#include <sys/resource.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -472,9 +473,13 @@ fail_keep_client:
 void
 init_client_list(void)
 {
+	struct rlimit rlim;
 	TAILQ_INIT(&clnt_list);
 	/* Eventually plan to grow/shrink poll array: */
 	pollsize = FD_ALLOC_BLOCK;
+	if (getrlimit(RLIMIT_NOFILE, &rlim) < 0 &&
+	    rlim.rlim_cur != RLIM_INFINITY)
+		pollsize = rlim.rlim_cur;
 	pollarray = calloc(pollsize, sizeof(struct pollfd));
 }