summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorneilbrown <neilbrown>2003-09-12 23:06:20 +0000
committerneilbrown <neilbrown>2003-09-12 23:06:20 +0000
commitb01c85ea978f15d313961724d9a64c8ae18b3766 (patch)
treefc9bbd76e5d42f95e9b53f7a5191011d1734128d
parent558af3e4e4be556db16d3fefe96cb12ef6ff8a46 (diff)
downloadnfs-utils-b01c85ea978f15d313961724d9a64c8ae18b3766.tar.gz
nfs-utils-b01c85ea978f15d313961724d9a64c8ae18b3766.tar.xz
nfs-utils-b01c85ea978f15d313961724d9a64c8ae18b3766.zip
1.0.6
-rw-r--r--ChangeLog7
-rw-r--r--utils/mountd/mountd.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f2d8af0..365a4a4 100644
--- 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 0d4ddb4..8f6f9cb 100644
--- 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",