diff --git a/postfix/HISTORY b/postfix/HISTORY index 3857599e8..243c9e040 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -14607,5 +14607,30 @@ Apologies for any names omitted. in the makedefs script, to make future updates easier. File: makedefs. - Cleanup: don't log multiple Milter "hold" actions for - the same message. File: cleanup/cleanup_milter.c. + Cleanup: don't log multiple Milter "hold" actions for the + same email message. File: cleanup/cleanup_milter.c. + +20080826 + + Cleanup: moving test programs from makedefs into a makedefs.d + directory brought more pain than gain. + + Cleanup: untangled the Linux version dependent sections in + the makedefs script, to make future updates easier. File: + makedefs. + + Documentation: MacOS process limit configuration by Quanah + Gibson-Mount. File: proto/TUNING_README.html. + + Feature: smtp-sink -M option to terminate after receiving + a specified number of messages. Laurent Gentil. File: + smtpstone/smtp-sink.c. + + Bugfix (introduced Postfix 2.4): epoll file descriptor leak. + With Postfix >= 2.4 on Linux >= 2.6, Postfix has an epoll + file descriptor leak when it executes non-Postfix commands + in, for example, user-controlled $HOME/.forward files. A + local user can access a leaked epoll file descriptor to + implement a denial of service attack on Postfix. Data + confidentiality and integrity are not affected. File: + util/events.c. diff --git a/postfix/README_FILES/TUNING_README b/postfix/README_FILES/TUNING_README index 8ee42f1fb..e7d80706c 100644 --- a/postfix/README_FILES/TUNING_README +++ b/postfix/README_FILES/TUNING_README @@ -35,6 +35,7 @@ Topics on mail delivery performance: Other Postfix performance tuning topics: * Tuning the number of Postfix processes + * Tuning the number of processes on the system * Tuning the number of open files or sockets The following tools can be used to measure mail system performance under @@ -412,6 +413,29 @@ deliveries, you could specify: smtp inet n - - - 10 smtpd . . . +TTuunniinngg tthhee nnuummbbeerr ooff pprroocceesssseess oonn tthhee ssyysstteemm + + * MacOS X will run out of process slots when you increase Postfix process + limits. The following works with OSX 10.4 and OSX 10.5. + + MacOS X kernel parameters can be specified in /etc/sysctl.conf. + + /etc/sysctl.conf: + kern.maxproc=2048 + kern.maxprocperuid=2048 + + Unfortunately these can't simply be set on the fly with "sysctl -w". You + also have to set the following in /etc/launchd.conf so that the root user + after boot will have the right process limit (2048). Otherwise you have to + always run ulimit -u 2048 as root, then start a user shell, and then start + processes for things to take effect. + + /etc/launchd.conf: + limit maxproc 2048 + + Once these are in place, reboot the system. After that, the limits will + stay in place. + TTuunniinngg tthhee nnuummbbeerr ooff ooppeenn ffiilleess oorr ssoocckkeettss When Postfix opens too many files or sockets, processes will abort with fatal diff --git a/postfix/WISHLIST b/postfix/WISHLIST index 3badd2ce4..e5d993a6f 100644 --- a/postfix/WISHLIST +++ b/postfix/WISHLIST @@ -1,5 +1,5 @@ Wish list: - + Force a panic when the VDA patch reduces the file size limit under the message size. They break the code that marks a recipient as "done", when that recipient was added late diff --git a/postfix/html/TUNING_README.html b/postfix/html/TUNING_README.html index 50e85d3ab..2da1fbbc9 100644 --- a/postfix/html/TUNING_README.html +++ b/postfix/html/TUNING_README.html @@ -69,6 +69,8 @@ complex database queries and so on.

  • Tuning the number of Postfix processes +
  • Tuning the number of processes on the system +
  • Tuning the number of open files or sockets @@ -581,6 +583,40 @@ specify:

    +

    Tuning the number of processes on the system

    + + +

    Tuning the number of open files or sockets

    When Postfix opens too many files or sockets, processes will diff --git a/postfix/html/postconf.5.html b/postfix/html/postconf.5.html index a4f0b6e18..a28054eb0 100644 --- a/postfix/html/postconf.5.html +++ b/postfix/html/postconf.5.html @@ -9397,7 +9397,8 @@ parameters smtp_use_tls, smtp_tls_policy_maps.

    may
    -
    Opportunistic TLS. TLS will be used if supported by the server. Since +
    Opportunistic TLS. Use TLS if this is supported by the remote +SMTP server, otherwise use plaintext. Since sending in the clear is acceptable, demanding stronger than default TLS security parameters merely reduces inter-operability. Postfix 2.3 and later ignore the smtp_tls_mandatory_ciphers and @@ -9408,7 +9409,7 @@ This allows mail delivery to sites with non-interoperable TLS implementations.
    encrypt
    Mandatory TLS encryption. Since a minimum -level of security is intended, it reasonable to be specific about +level of security is intended, it is reasonable to be specific about sufficiently secure protocol versions and ciphers. At this security level and higher, the main.cf parameters smtp_tls_mandatory_protocols and smtp_tls_mandatory_ciphers specify the TLS protocols and minimum diff --git a/postfix/makedefs b/postfix/makedefs index 953a06283..3b29323a7 100644 --- a/postfix/makedefs +++ b/postfix/makedefs @@ -37,6 +37,9 @@ # Do not build with IPv6 support. # By default, IPv6 support is compiled in on platforms that # are known to have IPv6 support. +# +# Note: this directive is for debugging and testing only. It +# is not guaranteed to work on all platforms. # .IP \fB-DNO_KQUEUE\fR # Do not build with FreeBSD/NetBSD/OpenBSD/MacOSX KQUEUE support. # By default, KQUEUE support is compiled in on platforms that @@ -92,12 +95,17 @@ error() { exit 1 } -SYSTEM=`(uname -s) 2>/dev/null` -RELEASE=`(uname -r) 2>/dev/null` -VERSION=`(uname -v) 2>/dev/null` - -case "$VERSION" in - dcosx*) SYSTEM=$VERSION;; +case $# in + # Officially supported usage. + 0) SYSTEM=`(uname -s) 2>/dev/null` + RELEASE=`(uname -r) 2>/dev/null` + VERSION=`(uname -v) 2>/dev/null` + case "$VERSION" in + dcosx*) SYSTEM=$VERSION;; + esac;; + # Unsupported debug-only mode. Not suitable for cross-platform tests. + 2) SYSTEM="$1"; RELEASE="$2";; + *) echo usage: $0 [system release] 1>&2; exit 1;; esac case "$SYSTEM.$RELEASE" in @@ -187,7 +195,7 @@ case "$SYSTEM.$RELEASE" in # Work around broken str*casecmp(). Do it all here instead # of having half the solution in the sys_defs.h file. CCARGS="$CCARGS -Dstrcasecmp=fix_strcasecmp \ - -Dstrncasecmp=fix_strncasecmp" + -Dstrncasecmp=fix_strncasecmp" STRCASE="strcasecmp.o" # Avoid common types of braindamage case "$LD_LIBRARY_PATH" in @@ -288,11 +296,29 @@ case "$SYSTEM.$RELEASE" in case "$RELEASE" in 2.[0-5].*) CCARGS="$CCARGS -DNO_EPOLL";; # Workaround for retarded libc - 2.6.*) trap 'rm -f linux_epoll linux_epoll.o' 1 2 3 15 - ${CC-gcc} -o linux_epoll makedefs.d/linux_epoll.c || exit 1 - ./linux_epoll 2>/dev/null || + 2.6.*) trap 'rm -f makedefs.test makedefs.test.[co]' 1 2 3 15 + cat >makedefs.test.c <<'EOF' +#include +#include +#include +#include +#include + +int main(int argc, char **argv) +{ + int epoll_handle; + + if ((epoll_handle = epoll_create(1)) < 0) { + perror("epoll_create"); + exit(1); + } + exit(0); +} +EOF + ${CC-gcc} -o makedefs.test makedefs.test.c || exit 1 + ./makedefs.test 2>/dev/null || CCARGS="$CCARGS -DNO_EPOLL" - rm -f linux_epoll linux_epoll.o;; + rm -f makedefs.test makedefs.test.[co];; esac ;; GNU.0*|GNU/kFreeBSD.[567]*) @@ -373,29 +399,70 @@ ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix543 : ${CC=cc} # Darwin > 1.3 uses awk and flat_namespace case $RELEASE in - 1.[0-3]) AWK=gawk - ;; + 1.[0-3]) AWK=gawk;; *) AWK=awk - SYSLIBS=-flat_namespace - ;; + SYSLIBS=-flat_namespace;; esac # Darwin 7 adds IPv6 support, BIND_8_COMPAT, NO_NETINFO case $RELEASE in - [1-6].*) CCARGS="$CCARGS -DNO_IPV6" - ;; - *) CCARGS="$CCARGS -DBIND_8_COMPAT -DNO_NETINFO" - ;; + [1-6].*) CCARGS="$CCARGS -DNO_IPV6";; + *) CCARGS="$CCARGS -DBIND_8_COMPAT -DNO_NETINFO";; esac # Darwin 8.11.1 has kqueue support, but let's play safe case $RELEASE in - [1-8].*) CCARGS="$CCARGS -DNO_KQUEUE" - ;; - *) trap 'rm -f macosx_kqueue macosx_kqueue.o' 1 2 3 15 - ${CC-gcc} -o macosx_kqueue makedefs.d/macosx_kqueue.c || exit 1 - ./macosx_kqueue 2>/dev/null || + [1-8].*) CCARGS="$CCARGS -DNO_KQUEUE";; + *) trap 'rm -f makedefs.test makedefs.test.[co]' 1 2 3 15 + cat >makedefs.test.c <<'EOF' +/* Adapted from libevent. */ + +#include +#include +#include +#include +#include +#include + +#ifndef EV_SET +#define EV_SET(kp, id, fi, fl, ffl, da, ud) do { \ + struct kevent *__kp = (kp); \ + __kp->ident = (id); \ + __kp->filter = (fi); \ + __kp->flags = (fl); \ + __kp->fflags = (ffl); \ + __kp->data = (da); \ + __kp->udata = (ud); \ + } while(0) +#endif + +int main(int argc, char **argv) +{ + int kq; + struct kevent test_change; + struct kevent test_result; + + if ((kq = kqueue()) < 0) { + perror("kqueue"); + exit(1); + } +#define TEST_FD (-1) + + EV_SET(&test_change, TEST_FD, EVFILT_READ, EV_ADD, 0, 0, 0); + if (kevent(kq, + &test_change, sizeof(test_change) / sizeof(struct kevent), + &test_result, sizeof(test_result) / sizeof(struct kevent), + (struct timespec *) 0) != 1 || + test_result.ident != TEST_FD || + test_result.flags != EV_ERROR) { + fprintf(stderr, "Error: kevent reports errors incorrectly\n"); + exit(1); + } + exit(0); +} +EOF + $CC -o makedefs.test makedefs.test.c || exit 1 + ./makedefs.test 2>/dev/null || CCARGS="$CCARGS -DNO_KQUEUE" - rm -f macosx_kqueue macosx_kqueue.o - ;; + rm -f makedefs.test makedefs.test.[co];; esac ;; Rhapsody.5*|"Mac OS".10*) @@ -432,10 +499,50 @@ esac # case "$CCARGS" in *-DNO_SIGSETJMP*) ;; - *) trap 'rm -f sigsetjmp sigsetjmp.o' 1 2 3 15 - ${CC-gcc} -o sigsetjmp makedefs.d/sigsetjmp.c || exit 1 - ./sigsetjmp 2>/dev/null || CCARGS="$CCARGS -DNO_SIGSETJMP" - rm -f sigsetjmp sigsetjmp.o;; + *) trap 'rm -f makedefs.test makedefs.test.[co]' 1 2 3 15 + cat >makedefs.test.c <<'EOF' +#include +#include +#include + +static int count = 0; + +int main(int argc, char **argv) +{ + sigjmp_buf env; + int retval; + + switch (retval = sigsetjmp(env, 1)) { + case 0: + siglongjmp(env, 12345); + case 12345: + break; + default: + fprintf(stderr, "Error: siglongjmp ignores second argument\n"); + exit(1); + } + + switch (retval = sigsetjmp(env, 1)) { + case 0: + if (count++ > 0) { + fprintf(stderr, "Error: not overriding siglongjmp(env, 0)\n"); + exit(1); + } + siglongjmp(env, 0); + case 1: + break; + default: + fprintf(stderr, "Error: overriding siglongjmp(env, 0) with %d\n", + retval); + exit(1); + } + exit(0); +} +EOF + ${CC-gcc} -o makedefs.test makedefs.test.c || exit 1 + ./makedefs.test 2>/dev/null || + CCARGS="$CCARGS -DNO_SIGSETJMP" + rm -f makedefs.test makedefs.test.[co] esac # diff --git a/postfix/makedefs.d/linux_epoll.c b/postfix/makedefs.d/linux_epoll.c deleted file mode 100644 index e34431465..000000000 --- a/postfix/makedefs.d/linux_epoll.c +++ /dev/null @@ -1,16 +0,0 @@ -#include -#include -#include -#include -#include - -int main(int argc, char **argv) -{ - int epoll_handle; - - if ((epoll_handle = epoll_create(1)) < 0) { - perror("epoll_create"); - exit(1); - } - exit(0); -} diff --git a/postfix/makedefs.d/macosx_kqueue.c b/postfix/makedefs.d/macosx_kqueue.c deleted file mode 100644 index 6590a5fca..000000000 --- a/postfix/makedefs.d/macosx_kqueue.c +++ /dev/null @@ -1,45 +0,0 @@ -/* Adapted from libevent. */ - -#include -#include -#include -#include -#include -#include - -#ifndef EV_SET -#define EV_SET(kp, id, fi, fl, ffl, da, ud) do { \ - struct kevent *__kp = (kp); \ - __kp->ident = (id); \ - __kp->filter = (fi); \ - __kp->flags = (fl); \ - __kp->fflags = (ffl); \ - __kp->data = (da); \ - __kp->udata = (ud); \ - } while(0) -#endif - -int main(int argc, char **argv) -{ - int kq; - struct kevent test_change; - struct kevent test_result; - - if ((kq = kqueue()) < 0) { - perror("kqueue"); - exit(1); - } -#define TEST_FD (-1) - - EV_SET(&test_change, TEST_FD, EVFILT_READ, EV_ADD, 0, 0, 0); - if (kevent(kq, - &test_change, sizeof(test_change) / sizeof(struct kevent), - &test_result, sizeof(test_result) / sizeof(struct kevent), - (struct timespec *) 0) != 1 || - test_result.ident != TEST_FD || - test_result.flags != EV_ERROR) { - fprintf(stderr, "kqueue is broken\n"); - exit(1); - } - exit(0); -} diff --git a/postfix/makedefs.d/sigsetjmp.c b/postfix/makedefs.d/sigsetjmp.c deleted file mode 100644 index 0b96c6d8a..000000000 --- a/postfix/makedefs.d/sigsetjmp.c +++ /dev/null @@ -1,37 +0,0 @@ -#include -#include -#include - -static int count = 0; - -int main(int argc, char **argv) -{ - sigjmp_buf env; - int retval; - - switch (retval = sigsetjmp(env, 1)) { - case 0: - siglongjmp(env, 12345); - case 12345: - break; - default: - fprintf(stderr, "Error: siglongjmp ignores second argument\n"); - exit(1); - } - - switch (retval = sigsetjmp(env, 1)) { - case 0: - if (count++ > 0) { - fprintf(stderr, "Error: not overriding siglongjmp(env, 0)\n"); - exit(1); - } - siglongjmp(env, 0); - case 1: - break; - default: - fprintf(stderr, "Error: overriding siglongjmp(env, 0) with %d\n", - retval); - exit(1); - } - exit(0); -} diff --git a/postfix/man/man5/postconf.5 b/postfix/man/man5/postconf.5 index cf363cade..e305c0306 100644 --- a/postfix/man/man5/postconf.5 +++ b/postfix/man/man5/postconf.5 @@ -5572,7 +5572,8 @@ Specify one of the following security levels: TLS will not be used unless enabled for specific destinations via smtp_tls_policy_maps. .IP "\fBmay\fR" -Opportunistic TLS. TLS will be used if supported by the server. Since +Opportunistic TLS. Use TLS if this is supported by the remote +SMTP server, otherwise use plaintext. Since sending in the clear is acceptable, demanding stronger than default TLS security parameters merely reduces inter-operability. Postfix 2.3 and later ignore the smtp_tls_mandatory_ciphers and @@ -5583,7 +5584,7 @@ This allows mail delivery to sites with non-interoperable TLS implementations. .IP "\fBencrypt\fR" Mandatory TLS encryption. Since a minimum -level of security is intended, it reasonable to be specific about +level of security is intended, it is reasonable to be specific about sufficiently secure protocol versions and ciphers. At this security level and higher, the main.cf parameters smtp_tls_mandatory_protocols and smtp_tls_mandatory_ciphers specify the TLS protocols and minimum diff --git a/postfix/proto/TUNING_README.html b/postfix/proto/TUNING_README.html index 7d129077e..09fc4bff2 100644 --- a/postfix/proto/TUNING_README.html +++ b/postfix/proto/TUNING_README.html @@ -69,6 +69,8 @@ complex database queries and so on.

  • Tuning the number of Postfix processes +
  • Tuning the number of processes on the system +
  • Tuning the number of open files or sockets @@ -581,6 +583,40 @@ specify:

    +

    Tuning the number of processes on the system

    + +
      + +

    • MacOS X will run out of process slots when you increase +Postfix process limits. The following works with OSX 10.4 and OSX +10.5.

      + +

      MacOS X kernel parameters can be specified in /etc/sysctl.conf. +

      + +
      +/etc/sysctl.conf:
+    kern.maxproc=2048
+    kern.maxprocperuid=2048
+
      + +

      Unfortunately these can't simply be set on the fly with "sysctl +-w". You also have to set the following in /etc/launchd.conf so +that the root user after boot will have the right process limit +(2048). Otherwise you have to always run ulimit -u 2048 as root, +then start a user shell, and then start processes for things to +take effect.

      + +
      +/etc/launchd.conf:
+    limit maxproc 2048
+
      + +

      Once these are in place, reboot the system. After that, the limits will +stay in place.

      + +
    +

    Tuning the number of open files or sockets

    When Postfix opens too many files or sockets, processes will diff --git a/postfix/proto/postconf.proto b/postfix/proto/postconf.proto index 1b19fa2f7..fd37b623e 100644 --- a/postfix/proto/postconf.proto +++ b/postfix/proto/postconf.proto @@ -10232,7 +10232,8 @@ parameters smtp_use_tls, smtp_enforce_tls, and smtp_tls_enforce_peername. destinations via smtp_tls_policy_maps.

    • may
    -
    Opportunistic TLS. TLS will be used if supported by the server. Since +
    Opportunistic TLS. Use TLS if this is supported by the remote +SMTP server, otherwise use plaintext. Since sending in the clear is acceptable, demanding stronger than default TLS security parameters merely reduces inter-operability. Postfix 2.3 and later ignore the smtp_tls_mandatory_ciphers and @@ -10243,7 +10244,7 @@ This allows mail delivery to sites with non-interoperable TLS implementations.
    encrypt
    Mandatory TLS encryption. Since a minimum -level of security is intended, it reasonable to be specific about +level of security is intended, it is reasonable to be specific about sufficiently secure protocol versions and ciphers. At this security level and higher, the main.cf parameters smtp_tls_mandatory_protocols and smtp_tls_mandatory_ciphers specify the TLS protocols and minimum diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h index 055986588..e7fc57ab3 100644 --- a/postfix/src/global/mail_version.h +++ b/postfix/src/global/mail_version.h @@ -20,7 +20,7 @@ * Patches change both the patchlevel and the release date. Snapshots have no * patchlevel; they change the release date only. */ -#define MAIL_RELEASE_DATE "20080824" +#define MAIL_RELEASE_DATE "20080902" #define MAIL_VERSION_NUMBER "2.6" #ifdef SNAPSHOT diff --git a/postfix/src/milter/milter.c b/postfix/src/milter/milter.c index c8a6b556a..6854b358c 100644 --- a/postfix/src/milter/milter.c +++ b/postfix/src/milter/milter.c @@ -107,8 +107,9 @@ /* /* The functions that inspect content or envelope commands /* return either an SMTP reply ([45]XX followed by enhanced -/* status code and text), "D" (discard), "H" (quarantine), or -/* a null pointer, which means "no news is good news". +/* status code and text), "D" (discard), "H" (quarantine), +/* "S" (shutdown connection), or a null pointer, which means +/* "no news is good news". /* /* milter_create() instantiates the milter clients specified /* with the milter_names argument. The conn_macros etc. diff --git a/postfix/src/smtpd/smtpd_check.c b/postfix/src/smtpd/smtpd_check.c index cd7e27175..9e2a1e859 100644 --- a/postfix/src/smtpd/smtpd_check.c +++ b/postfix/src/smtpd/smtpd_check.c @@ -3129,7 +3129,7 @@ static int reject_rbl_addr(SMTPD_STATE *state, const char *rbl_domain, * AAAA record makes no sense here. Just like with IPv4 we use the lookup * result as a bit mask, not as an IP address. */ -#ifdef PF_INET6 +#ifdef HAS_IPV6 if (valid_ipv6_hostaddr(addr, DONT_GRIPE)) { if (hostaddr_to_sockaddr(addr, (char *) 0, 0, &res) != 0 || res->ai_family != PF_INET6) diff --git a/postfix/src/smtpstone/smtp-sink.c b/postfix/src/smtpstone/smtp-sink.c index d9aac9b08..cfba4d05d 100644 --- a/postfix/src/smtpstone/smtp-sink.c +++ b/postfix/src/smtpstone/smtp-sink.c @@ -96,8 +96,10 @@ /* connections that \fBsmtp-sink\fR will handle. This prevents /* the process from running out of file descriptors. Excess /* connections will stay queued in the TCP/IP stack. +/* .IP "\fB-M \fIcount\fR" +/* Terminate after receiving \fIcount\fR messages. /* .IP "\fB-n \fIcount\fR" -/* Terminate after \fIcount\fR sessions. This is for testing purposes. +/* Terminate after \fIcount\fR sessions. /* .IP \fB-p\fR /* Do not announce support for ESMTP command pipelining. /* .IP \fB-P\fR @@ -333,6 +335,7 @@ static int sess_count; static int quit_count; static int mesg_count; static int max_quit_count; +static int max_msg_quit_count; static int disable_pipelining; static int disable_8bitmime; static int disable_esmtp; @@ -880,9 +883,12 @@ static int data_read(SINK_STATE *state) if (state->dump_file) mail_file_finish(state); mail_cmd_reset(state); - if (count) { + if (count || max_msg_quit_count > 0) { mesg_count++; - do_stats(); + if (count) + do_stats(); + if (max_msg_quit_count > 0 && mesg_count >= max_msg_quit_count) + exit(0); } break; } @@ -1357,7 +1363,7 @@ static void connect_event(int unused_event, char *unused_context) static void usage(char *myname) { - msg_fatal("usage: %s [-468acCeEFLpPv] [-A abort_delay] [-f commands] [-h hostname] [-m max_concurrency] [-n quit_count] [-q commands] [-r commands] [-s commands] [-w delay] [-d dump-template] [-D dump-template] [-R root-dir] [-S start-string] [-u user_privs] [host]:port backlog", myname); + msg_fatal("usage: %s [-468acCeEFLpPv] [-A abort_delay] [-d dump-template] [-D dump-template] [-f commands] [-h hostname] [-m max_concurrency] [M message_quit_count] [-n quit_count] [-q commands] [-r commands] [-R root-dir] [-s commands] [-S start-string] [-u user_privs] [-w delay] [host]:port backlog", myname); } MAIL_VERSION_STAMP_DECLARE; @@ -1389,7 +1395,7 @@ int main(int argc, char **argv) /* * Parse JCL. */ - while ((ch = GETOPT(argc, argv, "468aA:cCd:D:eEf:Fh:Ln:m:pPq:Q:r:R:s:S:t:u:vw:W:")) > 0) { + while ((ch = GETOPT(argc, argv, "468aA:cCd:D:eEf:Fh:Ln:m:M:pPq:Q:r:R:s:S:t:u:vw:W:")) > 0) { switch (ch) { case '4': protocols = INET_PROTO_NAME_IPV4; @@ -1444,6 +1450,10 @@ int main(int argc, char **argv) if ((max_client_count = atoi(optarg)) <= 0) msg_fatal("bad concurrency limit: %s", optarg); break; + case 'M': + if ((max_msg_quit_count = atoi(optarg)) <= 0) + msg_fatal("bad message quit count: %s", optarg); + break; case 'n': if ((max_quit_count = atoi(optarg)) <= 0) msg_fatal("bad quit count: %s", optarg); diff --git a/postfix/src/util/events.c b/postfix/src/util/events.c index 288ad695f..bb59b8f75 100644 --- a/postfix/src/util/events.c +++ b/postfix/src/util/events.c @@ -355,6 +355,7 @@ static int event_pollfd; /* handle to file descriptor set */ #define EVENT_REG_INIT_HANDLE(er, n) do { \ er = event_pollfd = open("/dev/poll", O_RDWR); \ + if (event_pollfd >= 0) close_on_exec(event_pollfd, CLOSE_ON_EXEC); \ } while (0) #define EVENT_REG_INIT_TEXT "open /dev/poll" @@ -426,6 +427,7 @@ static int event_epollfd; /* epoll handle */ #define EVENT_REG_INIT_HANDLE(er, n) do { \ er = event_epollfd = epoll_create(n); \ + if (event_epollfd >= 0) close_on_exec(event_epollfd, CLOSE_ON_EXEC); \ } while (0) #define EVENT_REG_INIT_TEXT "epoll_create"