1.0.6

[nfs-utils.git] / utils / mountd / mountd.c

diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c
index 0d4ddb43970a762e4a5547ec0f6f61d2cd825cb4..8f6f9cb9d85d8ad69754a9db1bdbda2233feab76 100644 (file)
--- a/utils/mountd/mountd.c
+++ b/utils/mountd/mountd.c
@@ -509,10 +509,10 @@ main(int argc, char **argv)
                                argv [0], strerror(errno));
        else {
                /* glibc sunrpc code dies if getdtablesize > FD_SETSIZE */
-               if (descriptors == 0 && rlim.rlim_cur > FD_SETSIZE)
+               if ((descriptors == 0 && rlim.rlim_cur > FD_SETSIZE) ||
+                   descriptors > FD_SETSIZE)
                        descriptors = FD_SETSIZE;
                if (descriptors) {
-
                        rlim.rlim_cur = descriptors;
                        if (setrlimit (RLIMIT_NOFILE, &rlim) != 0) {
                                fprintf(stderr, "%s: setrlimit (RLIMIT_NOFILE) failed: %s\n",