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