]> git.decadent.org.uk Git - nfs-utils.git/commitdiff
gssd: base the size of the fd array on the RLIMIT_NOFILE limit.
authorNeilBrown <neilb@suse.de>
Wed, 28 Nov 2012 19:35:25 +0000 (14:35 -0500)
committerSteve Dickson <steved@redhat.com>
Wed, 28 Nov 2012 19:48:02 +0000 (14:48 -0500)
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>
utils/gssd/gssd_proc.c

index 6f9840e7467218ec8862c54ab2bd015f2143ab99..d01ba2fe6778439d7db22c3d993b7ed215c57363 100644 (file)
@@ -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));
 }