From: neilbrown <neilbrown>
Date: Fri, 12 Sep 2003 23:06:20 +0000 (+0000)
Subject: 1.0.6
X-Git-Tag: nfs-utils-1-0-6~2
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=commitdiff_plain;h=b01c85ea978f15d313961724d9a64c8ae18b3766;hp=558af3e4e4be556db16d3fefe96cb12ef6ff8a46;ds=sidebyside

1.0.6
---

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