1.0.6

diff --git a/ChangeLog b/ChangeLog
index f2d8af0f9bdb86425ac9ac5d1ec4c4a9fb21c27f..365a4a4508826c5722373600f9ac0b115808fd06 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-09-15 NeilBrown <neilb@cse.unsw.edu.au>
+
+       Release 1.0.6
+
+       * configure.in, nfs-utils.spec: Update version to 1.0.4
+       * run autoconf
+       
 2003-09-12  Chip Salzenberg  <chip@pobox.com>
 
        * debian/changelog: Version 1.0.6-1.

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",