38f2261
--- cyrus-imapd-2.1.16/master/master.c.getrlimit	2003-12-28 17:32:46.000000000 +0100
38f2261
+++ cyrus-imapd-2.1.16/master/master.c	2003-12-28 17:43:56.000000000 +0100
38f2261
@@ -1208,12 +1208,10 @@
38f2261
     rl.rlim_cur = x;
38f2261
     rl.rlim_max = x;
38f2261
     if (setrlimit(RLIMIT_NUMFDS, &rl) < 0) {
38f2261
-	syslog(LOG_ERR, "setrlimit: Unable to set file descriptors limit to %ld: %m", x);
38f2261
 
38f2261
 #ifdef HAVE_GETRLIMIT
38f2261
 
38f2261
 	if (!getrlimit(RLIMIT_NUMFDS, &rl)) {
38f2261
-	    syslog(LOG_ERR, "retrying with %ld (current max)", rl.rlim_max);
38f2261
 	    rl.rlim_cur = rl.rlim_max;
38f2261
 	    if (setrlimit(RLIMIT_NUMFDS, &rl) < 0) {
38f2261
 		syslog(LOG_ERR, "setrlimit: Unable to set file descriptors limit to %ld: %m", x);
38f2261
@@ -1228,6 +1226,7 @@
38f2261
 	       rl.rlim_max);
38f2261
     }
38f2261
 #else
38f2261
+	syslog(LOG_ERR, "setrlimit: Unable to set file descriptors limit to %ld: %m", x);
38f2261
     }
38f2261
 #endif /* HAVE_GETRLIMIT */
38f2261
 }