]>
Commit | Line | Data |
---|---|---|
b40388bb MT |
1 | --- cyrus-imapd-2.1.16/master/master.c.getrlimit 2003-12-28 17:32:46.000000000 +0100 |
2 | +++ cyrus-imapd-2.1.16/master/master.c 2003-12-28 17:43:56.000000000 +0100 | |
3 | @@ -1208,12 +1208,10 @@ | |
4 | rl.rlim_cur = x; | |
5 | rl.rlim_max = x; | |
6 | if (setrlimit(RLIMIT_NUMFDS, &rl) < 0) { | |
7 | - syslog(LOG_ERR, "setrlimit: Unable to set file descriptors limit to %ld: %m", x); | |
8 | ||
9 | #ifdef HAVE_GETRLIMIT | |
10 | ||
11 | if (!getrlimit(RLIMIT_NUMFDS, &rl)) { | |
12 | - syslog(LOG_ERR, "retrying with %ld (current max)", rl.rlim_max); | |
13 | rl.rlim_cur = rl.rlim_max; | |
14 | if (setrlimit(RLIMIT_NUMFDS, &rl) < 0) { | |
15 | syslog(LOG_ERR, "setrlimit: Unable to set file descriptors limit to %ld: %m", x); | |
16 | @@ -1228,6 +1226,7 @@ | |
17 | rl.rlim_max); | |
18 | } | |
19 | #else | |
20 | + syslog(LOG_ERR, "setrlimit: Unable to set file descriptors limit to %ld: %m", x); | |
21 | } | |
22 | #endif /* HAVE_GETRLIMIT */ | |
23 | } |