From: Wietse Venema Date: Thu, 1 Mar 2007 05:00:00 +0000 (-0500) Subject: postfix-2.4.0-RC2 X-Git-Tag: v2.4.0-RC2^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bb0ea6ed787143266f8a7a5696bd158a719d38b;p=thirdparty%2Fpostfix.git postfix-2.4.0-RC2 --- diff --git a/postfix/HISTORY b/postfix/HISTORY index 34c956f4e..92ad76d49 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -13305,6 +13305,16 @@ Apologies for any names omitted. mailbox dotlock files on all systems, and creates dotlock files before opening mailbox files. Files: util/sys_defs.h. +20070301 + + Workaround: updated workaround for broken Solaris accept(). + File: util/inet_listen.c. + + Workaround: on some FreeBSD versions, accept(2) can fail + with a bogus EINVAL error. We now allow accept(2) to fail + for a limited number of times before terminating the process. + Files: master/single_server.c, master/multi_server.c. + Wish list: Update message content length when adding/removing headers. diff --git a/postfix/README_FILES/DATABASE_README b/postfix/README_FILES/DATABASE_README index ef86f651c..c1202d22a 100644 --- a/postfix/README_FILES/DATABASE_README +++ b/postfix/README_FILES/DATABASE_README @@ -244,7 +244,7 @@ To find out what database types your Postfix system supports, use the "ppooss in tcp_table(5). The lookup table name is "tcp:host:port" where "host" specifies a symbolic hostname or a numeric IP address, and "port" specifies a symbolic service name or a numeric port number. This - protocol is not available up to and including Postfix version 2.2. + protocol is not available up to and including Postfix version 2.4. uunniixx (read-only) A limited way to query the UNIX authentication database. The following tables are implemented: diff --git a/postfix/README_FILES/TLS_LEGACY_README b/postfix/README_FILES/TLS_LEGACY_README index c534beb48..c3c9ee177 100644 --- a/postfix/README_FILES/TLS_LEGACY_README +++ b/postfix/README_FILES/TLS_LEGACY_README @@ -558,7 +558,7 @@ Their DSA counterparts: /etc/postfix/main.cf: smtp_tls_dcert_file = /etc/postfix/client-dsa.pem - smtp_tls_dkey_file = $smtpd_tls_cert_file + smtp_tls_dkey_file = $smtp_tls_cert_file To verify a remote SMTP server certificate, the Postfix SMTP client needs to trust the certificates of the issuing certification authorities. These @@ -578,7 +578,7 @@ files in the directory when the information is needed. Thus, the $smtp_tls_CApath directory needs to be accessible inside the optional chroot jail. -The choice between $smtp_tls_CAfile and $smtpd_tls_CApath is a space/time +The choice between $smtp_tls_CAfile and $smtp_tls_CApath is a space/time tradeoff. If there are many trusted CAs, the cost of preloading them all into memory may not pay off in reduced access time when the certificate is needed. diff --git a/postfix/README_FILES/TLS_README b/postfix/README_FILES/TLS_README index dc12a8ff7..33fd9bed0 100644 --- a/postfix/README_FILES/TLS_README +++ b/postfix/README_FILES/TLS_README @@ -673,7 +673,7 @@ Their DSA counterparts: /etc/postfix/main.cf: smtp_tls_dcert_file = /etc/postfix/client-dsa.pem - smtp_tls_dkey_file = $smtpd_tls_cert_file + smtp_tls_dkey_file = $smtp_tls_cert_file To verify a remote SMTP server certificate, the Postfix SMTP client needs to trust the certificates of the issuing certification authorities. These @@ -693,7 +693,7 @@ files in the directory when the information is needed. Thus, the $smtp_tls_CApath directory needs to be accessible inside the optional chroot jail. -The choice between $smtp_tls_CAfile and $smtpd_tls_CApath is a space/time +The choice between $smtp_tls_CAfile and $smtp_tls_CApath is a space/time tradeoff. If there are many trusted CAs, the cost of preloading them all into memory may not pay off in reduced access time when the certificate is needed. diff --git a/postfix/conf/access b/postfix/conf/access index 633f4d03b..bfdb724e1 100644 --- a/postfix/conf/access +++ b/postfix/conf/access @@ -355,7 +355,7 @@ # lookups are directed to a TCP-based server. For a descrip- # tion of the TCP client/server lookup protocol, see tcp_ta- # ble(5). This feature is not available up to and including -# Postfix version 2.3. +# Postfix version 2.4. # # Each lookup operation uses the entire query string once. # Depending on the application, that string is an entire diff --git a/postfix/conf/canonical b/postfix/conf/canonical index 1dc739589..53f7dfeae 100644 --- a/postfix/conf/canonical +++ b/postfix/conf/canonical @@ -156,7 +156,7 @@ # lookups are directed to a TCP-based server. For a descrip- # tion of the TCP client/server lookup protocol, see tcp_ta- # ble(5). This feature is not available up to and including -# Postfix version 2.3. +# Postfix version 2.4. # # Each lookup operation uses the entire address once. Thus, # user@domain mail addresses are not broken up into their diff --git a/postfix/conf/generic b/postfix/conf/generic index 232e7b058..9be1915c5 100644 --- a/postfix/conf/generic +++ b/postfix/conf/generic @@ -136,7 +136,7 @@ # lookups are directed to a TCP-based server. For a descrip- # tion of the TCP client/server lookup protocol, see tcp_ta- # ble(5). This feature is not available up to and including -# Postfix version 2.3. +# Postfix version 2.4. # # Each lookup operation uses the entire address once. Thus, # user@domain mail addresses are not broken up into their diff --git a/postfix/conf/post-install b/postfix/conf/post-install index 27d6ac2bd..6620d6322 100644 --- a/postfix/conf/post-install +++ b/postfix/conf/post-install @@ -586,18 +586,9 @@ EOF # Turn on safety nets for new features that could bounce mail that # would be accepted by a previous Postfix version. - # This safety net is also documented in LOCAL_RECIPIENT_README. -# unknown_local=unknown_local_recipient_reject_code -# has_lrm=`$POSTCONF -c $config_directory -n local_recipient_maps` -# has_lrjc=`$POSTCONF -c $config_directory -n $unknown_local` -# -# if [ -z "$has_lrm" -a -z "$has_lrjc" ] -# then -# echo SAFETY: editing main.cf, setting $unknown_local=450. -# echo See the LOCAL_RECIPIENT_README file for details. -# $POSTCONF -c $config_directory -e "$unknown_local = 450" || exit 1 -# fi + # [The "unknown_local_recipient_reject_code = 450" safety net, + # introduced with Postfix 2.0 and deleted after Postfix 2.3.] # Add missing proxymap service to master.cf. diff --git a/postfix/conf/relocated b/postfix/conf/relocated index ba018e5bc..e0f70ae3b 100644 --- a/postfix/conf/relocated +++ b/postfix/conf/relocated @@ -85,7 +85,7 @@ # regexp_table(5) or pcre_table(5). For a description of the # TCP client/server table lookup protocol, see tcp_table(5). # This feature is not available up to and including Postfix -# version 2.3. +# version 2.4. # # Each pattern is a regular expression that is applied to # the entire address being looked up. Thus, user@domain mail @@ -106,7 +106,7 @@ # lookups are directed to a TCP-based server. For a descrip- # tion of the TCP client/server lookup protocol, see tcp_ta- # ble(5). This feature is not available up to and including -# Postfix version 2.3. +# Postfix version 2.4. # # Each lookup operation uses the entire address once. Thus, # user@domain mail addresses are not broken up into their diff --git a/postfix/conf/transport b/postfix/conf/transport index 3f0688494..1258fb78a 100644 --- a/postfix/conf/transport +++ b/postfix/conf/transport @@ -237,7 +237,7 @@ # lookups are directed to a TCP-based server. For a descrip- # tion of the TCP client/server lookup protocol, see tcp_ta- # ble(5). This feature is not available up to and including -# Postfix version 2.3. +# Postfix version 2.4. # # Each lookup operation uses the entire recipient address # once. Thus, some.domain.hierarchy is not looked up via diff --git a/postfix/conf/virtual b/postfix/conf/virtual index a3fc4cf40..e1f3980dd 100644 --- a/postfix/conf/virtual +++ b/postfix/conf/virtual @@ -203,7 +203,7 @@ # lookups are directed to a TCP-based server. For a descrip- # tion of the TCP client/server lookup protocol, see tcp_ta- # ble(5). This feature is not available up to and including -# Postfix version 2.3. +# Postfix version 2.4. # # Each lookup operation uses the entire address once. Thus, # user@domain mail addresses are not broken up into their diff --git a/postfix/html/DATABASE_README.html b/postfix/html/DATABASE_README.html index 84838b569..315fe1c20 100644 --- a/postfix/html/DATABASE_README.html +++ b/postfix/html/DATABASE_README.html @@ -54,7 +54,7 @@ documentation: 

-/etc/postfix/main.cf:
+/etc/postfix/main.cf:
     alias_maps = hash:/etc/postfix/aliases            (local aliasing)
     header_checks = regexp:/etc/postfix/header_checks (content filtering)
     transport_maps = hash:/etc/postfix/transport      (routing table)
@@ -364,7 +364,7 @@ described in tcp_table(5). The lookup table name
 where "host" specifies a symbolic hostname or a numeric IP address,
 and "port" specifies a symbolic service name or a numeric port
 number. This protocol is not available up to and including Postfix
-version 2.2.  
+version 2.4.  
 
 
 unix (read-only) 

 
diff --git a/postfix/html/TLS_LEGACY_README.html b/postfix/html/TLS_LEGACY_README.html
index 634c3828b..9de6dff90 100644
--- a/postfix/html/TLS_LEGACY_README.html
+++ b/postfix/html/TLS_LEGACY_README.html
@@ -829,7 +829,7 @@ is correctly configured to supply its intermediate CA certificate). 

 
 /etc/postfix/main.cf:
     smtp_tls_dcert_file = /etc/postfix/client-dsa.pem
-    smtp_tls_dkey_file = $smtpd_tls_cert_file
+    smtp_tls_dkey_file = $smtp_tls_cert_file
@@ -857,7 +857,7 @@ privileges) from the files in the directory when the information is needed. Thus, the $smtp_tls_CApath directory needs to be accessible inside the optional chroot jail.

-

The choice between $smtp_tls_CAfile and $smtpd_tls_CApath is +

The choice between $smtp_tls_CAfile and $smtp_tls_CApath is a space/time tradeoff. If there are many trusted CAs, the cost of preloading them all into memory may not pay off in reduced access time when the certificate is needed.

diff --git a/postfix/html/TLS_README.html b/postfix/html/TLS_README.html index 4ad918612..338d553e2 100644 --- a/postfix/html/TLS_README.html +++ b/postfix/html/TLS_README.html @@ -969,7 +969,7 @@ is correctly configured to supply its intermediate CA certificate). 

 /etc/postfix/main.cf:
     smtp_tls_dcert_file = /etc/postfix/client-dsa.pem
-    smtp_tls_dkey_file = $smtpd_tls_cert_file
+    smtp_tls_dkey_file = $smtp_tls_cert_file
@@ -997,7 +997,7 @@ privileges) from the files in the directory when the information is needed. Thus, the $smtp_tls_CApath directory needs to be accessible inside the optional chroot jail.

-

The choice between $smtp_tls_CAfile and $smtpd_tls_CApath is +

The choice between $smtp_tls_CAfile and $smtp_tls_CApath is a space/time tradeoff. If there are many trusted CAs, the cost of preloading them all into memory may not pay off in reduced access time when the certificate is needed.

diff --git a/postfix/html/access.5.html b/postfix/html/access.5.html index 1500b784a..7e9fceca2 100644 --- a/postfix/html/access.5.html +++ b/postfix/html/access.5.html @@ -361,7 +361,7 @@ ACCESS(5) ACCESS(5) lookups are directed to a TCP-based server. For a descrip- tion of the TCP client/server lookup protocol, see tcp_ta- ble(5). This feature is not available up to and including - Postfix version 2.3. + Postfix version 2.4. Each lookup operation uses the entire query string once. Depending on the application, that string is an entire diff --git a/postfix/html/canonical.5.html b/postfix/html/canonical.5.html index 8ee71e649..8c6ceced9 100644 --- a/postfix/html/canonical.5.html +++ b/postfix/html/canonical.5.html @@ -162,7 +162,7 @@ CANONICAL(5) CANONICAL(5) lookups are directed to a TCP-based server. For a descrip- tion of the TCP client/server lookup protocol, see tcp_ta- ble(5). This feature is not available up to and including - Postfix version 2.3. + Postfix version 2.4. Each lookup operation uses the entire address once. Thus, user@domain mail addresses are not broken up into their diff --git a/postfix/html/generic.5.html b/postfix/html/generic.5.html index e0c2a5e00..ba40cc614 100644 --- a/postfix/html/generic.5.html +++ b/postfix/html/generic.5.html @@ -142,7 +142,7 @@ GENERIC(5) GENERIC(5) lookups are directed to a TCP-based server. For a descrip- tion of the TCP client/server lookup protocol, see tcp_ta- ble(5). This feature is not available up to and including - Postfix version 2.3. + Postfix version 2.4. Each lookup operation uses the entire address once. Thus, user@domain mail addresses are not broken up into their diff --git a/postfix/html/relocated.5.html b/postfix/html/relocated.5.html index f3d27d524..ff47a34a7 100644 --- a/postfix/html/relocated.5.html +++ b/postfix/html/relocated.5.html @@ -91,7 +91,7 @@ RELOCATED(5) RELOCATED(5) regexp_table(5) or pcre_table(5). For a description of the TCP client/server table lookup protocol, see tcp_table(5). This feature is not available up to and including Postfix - version 2.3. + version 2.4. Each pattern is a regular expression that is applied to the entire address being looked up. Thus, user@domain mail @@ -112,7 +112,7 @@ RELOCATED(5) RELOCATED(5) lookups are directed to a TCP-based server. For a descrip- tion of the TCP client/server lookup protocol, see tcp_ta- ble(5). This feature is not available up to and including - Postfix version 2.3. + Postfix version 2.4. Each lookup operation uses the entire address once. Thus, user@domain mail addresses are not broken up into their diff --git a/postfix/html/transport.5.html b/postfix/html/transport.5.html index 609131a52..5e06f5b55 100644 --- a/postfix/html/transport.5.html +++ b/postfix/html/transport.5.html @@ -243,7 +243,7 @@ TRANSPORT(5) TRANSPORT(5) lookups are directed to a TCP-based server. For a descrip- tion of the TCP client/server lookup protocol, see tcp_ta- ble(5). This feature is not available up to and including - Postfix version 2.3. + Postfix version 2.4. Each lookup operation uses the entire recipient address once. Thus, some.domain.hierarchy is not looked up via diff --git a/postfix/html/virtual.5.html b/postfix/html/virtual.5.html index c1dd3872e..bc45d2a12 100644 --- a/postfix/html/virtual.5.html +++ b/postfix/html/virtual.5.html @@ -209,7 +209,7 @@ VIRTUAL(5) VIRTUAL(5) lookups are directed to a TCP-based server. For a descrip- tion of the TCP client/server lookup protocol, see tcp_ta- ble(5). This feature is not available up to and including - Postfix version 2.3. + Postfix version 2.4. Each lookup operation uses the entire address once. Thus, user@domain mail addresses are not broken up into their diff --git a/postfix/makedefs b/postfix/makedefs index 3a6842861..e8b07639f 100644 --- a/postfix/makedefs +++ b/postfix/makedefs @@ -456,7 +456,7 @@ ${WARN='-Wall -Wno-comment -Wformat -Wimplicit -Wmissing-prototypes \ export SYSTYPE AR ARFL RANLIB SYSLIBS CC OPT DEBUG AWK OPTS # Snapshot only. -CCARGS="$CCARGS -DSNAPSHOT" +#CCARGS="$CCARGS -DSNAPSHOT" # Non-production: needs thorough testing, or major changes are still # needed before the code stabilizes. diff --git a/postfix/man/man5/access.5 b/postfix/man/man5/access.5 index ad4f084a4..568a12df7 100644 --- a/postfix/man/man5/access.5 +++ b/postfix/man/man5/access.5 @@ -340,7 +340,7 @@ pattern can be interpolated as \fB$1\fR, \fB$2\fR and so on. This section describes how the table lookups change when lookups are directed to a TCP-based server. For a description of the TCP client/server lookup protocol, see \fBtcp_table\fR(5). -This feature is not available up to and including Postfix version 2.3. +This feature is not available up to and including Postfix version 2.4. Each lookup operation uses the entire query string once. Depending on the application, that string is an entire client diff --git a/postfix/man/man5/canonical.5 b/postfix/man/man5/canonical.5 index 1faefbca7..f8b4747fa 100644 --- a/postfix/man/man5/canonical.5 +++ b/postfix/man/man5/canonical.5 @@ -166,7 +166,7 @@ pattern can be interpolated as \fB$1\fR, \fB$2\fR and so on. This section describes how the table lookups change when lookups are directed to a TCP-based server. For a description of the TCP client/server lookup protocol, see \fBtcp_table\fR(5). -This feature is not available up to and including Postfix version 2.3. +This feature is not available up to and including Postfix version 2.4. Each lookup operation uses the entire address once. Thus, \fIuser@domain\fR mail addresses are not broken up into their diff --git a/postfix/man/man5/generic.5 b/postfix/man/man5/generic.5 index e0ec31a84..59fbc6651 100644 --- a/postfix/man/man5/generic.5 +++ b/postfix/man/man5/generic.5 @@ -150,7 +150,7 @@ pattern can be interpolated as \fB$1\fR, \fB$2\fR and so on. This section describes how the table lookups change when lookups are directed to a TCP-based server. For a description of the TCP client/server lookup protocol, see \fBtcp_table\fR(5). -This feature is not available up to and including Postfix version 2.3. +This feature is not available up to and including Postfix version 2.4. Each lookup operation uses the entire address once. Thus, \fIuser@domain\fR mail addresses are not broken up into their diff --git a/postfix/man/man5/relocated.5 b/postfix/man/man5/relocated.5 index e1d65a2d6..11f813618 100644 --- a/postfix/man/man5/relocated.5 +++ b/postfix/man/man5/relocated.5 @@ -98,7 +98,7 @@ directed to a TCP-based server. For a description of regular expression lookup table syntax, see \fBregexp_table\fR(5) or \fBpcre_table\fR(5). For a description of the TCP client/server table lookup protocol, see \fBtcp_table\fR(5). -This feature is not available up to and including Postfix version 2.3. +This feature is not available up to and including Postfix version 2.4. Each pattern is a regular expression that is applied to the entire address being looked up. Thus, \fIuser@domain\fR mail addresses are not @@ -119,7 +119,7 @@ pattern can be interpolated as \fB$1\fR, \fB$2\fR and so on. This section describes how the table lookups change when lookups are directed to a TCP-based server. For a description of the TCP client/server lookup protocol, see \fBtcp_table\fR(5). -This feature is not available up to and including Postfix version 2.3. +This feature is not available up to and including Postfix version 2.4. Each lookup operation uses the entire address once. Thus, \fIuser@domain\fR mail addresses are not broken up into their diff --git a/postfix/man/man5/transport.5 b/postfix/man/man5/transport.5 index 7283c334f..dd5f12fa3 100644 --- a/postfix/man/man5/transport.5 +++ b/postfix/man/man5/transport.5 @@ -249,7 +249,7 @@ pattern can be interpolated as \fB$1\fR, \fB$2\fR and so on. This section describes how the table lookups change when lookups are directed to a TCP-based server. For a description of the TCP client/server lookup protocol, see \fBtcp_table\fR(5). -This feature is not available up to and including Postfix version 2.3. +This feature is not available up to and including Postfix version 2.4. Each lookup operation uses the entire recipient address once. Thus, \fIsome.domain.hierarchy\fR is not looked up via its parent domains, diff --git a/postfix/man/man5/virtual.5 b/postfix/man/man5/virtual.5 index 7f7ee5f2f..139c87a4a 100644 --- a/postfix/man/man5/virtual.5 +++ b/postfix/man/man5/virtual.5 @@ -221,7 +221,7 @@ pattern can be interpolated as \fB$1\fR, \fB$2\fR and so on. This section describes how the table lookups change when lookups are directed to a TCP-based server. For a description of the TCP client/server lookup protocol, see \fBtcp_table\fR(5). -This feature is not available up to and including Postfix version 2.3. +This feature is not available up to and including Postfix version 2.4. Each lookup operation uses the entire address once. Thus, \fIuser@domain\fR mail addresses are not broken up into their diff --git a/postfix/proto/DATABASE_README.html b/postfix/proto/DATABASE_README.html index ab2cf804f..7718c7d21 100644 --- a/postfix/proto/DATABASE_README.html +++ b/postfix/proto/DATABASE_README.html @@ -364,7 +364,7 @@ described in tcp_table(5). The lookup table name is "tcp:host:port" where "host" specifies a symbolic hostname or a numeric IP address, and "port" specifies a symbolic service name or a numeric port number. This protocol is not available up to and including Postfix -version 2.2. +version 2.4.
unix (read-only)
diff --git a/postfix/proto/TLS_LEGACY_README.html b/postfix/proto/TLS_LEGACY_README.html index ba1dff037..5a0566956 100644 --- a/postfix/proto/TLS_LEGACY_README.html +++ b/postfix/proto/TLS_LEGACY_README.html @@ -829,7 +829,7 @@ is correctly configured to supply its intermediate CA certificate). 

 /etc/postfix/main.cf:
     smtp_tls_dcert_file = /etc/postfix/client-dsa.pem
-    smtp_tls_dkey_file = $smtpd_tls_cert_file
+    smtp_tls_dkey_file = $smtp_tls_cert_file
@@ -857,7 +857,7 @@ privileges) from the files in the directory when the information is needed. Thus, the $smtp_tls_CApath directory needs to be accessible inside the optional chroot jail.

-

The choice between $smtp_tls_CAfile and $smtpd_tls_CApath is +

The choice between $smtp_tls_CAfile and $smtp_tls_CApath is a space/time tradeoff. If there are many trusted CAs, the cost of preloading them all into memory may not pay off in reduced access time when the certificate is needed.

diff --git a/postfix/proto/TLS_README.html b/postfix/proto/TLS_README.html index 0d341714b..976082ac0 100644 --- a/postfix/proto/TLS_README.html +++ b/postfix/proto/TLS_README.html @@ -969,7 +969,7 @@ is correctly configured to supply its intermediate CA certificate). 

 /etc/postfix/main.cf:
     smtp_tls_dcert_file = /etc/postfix/client-dsa.pem
-    smtp_tls_dkey_file = $smtpd_tls_cert_file
+    smtp_tls_dkey_file = $smtp_tls_cert_file
@@ -997,7 +997,7 @@ privileges) from the files in the directory when the information is needed. Thus, the $smtp_tls_CApath directory needs to be accessible inside the optional chroot jail.

-

The choice between $smtp_tls_CAfile and $smtpd_tls_CApath is +

The choice between $smtp_tls_CAfile and $smtp_tls_CApath is a space/time tradeoff. If there are many trusted CAs, the cost of preloading them all into memory may not pay off in reduced access time when the certificate is needed.

diff --git a/postfix/proto/access b/postfix/proto/access index 2e2af8615..ff9876cf6 100644 --- a/postfix/proto/access +++ b/postfix/proto/access @@ -339,7 +339,7 @@ # This section describes how the table lookups change when lookups # are directed to a TCP-based server. For a description of the TCP # client/server lookup protocol, see \fBtcp_table\fR(5). -# This feature is not available up to and including Postfix version 2.3. +# This feature is not available up to and including Postfix version 2.4. # # Each lookup operation uses the entire query string once. # Depending on the application, that string is an entire client diff --git a/postfix/proto/canonical b/postfix/proto/canonical index 1aeb6e752..67683058f 100644 --- a/postfix/proto/canonical +++ b/postfix/proto/canonical @@ -146,7 +146,7 @@ # This section describes how the table lookups change when lookups # are directed to a TCP-based server. For a description of the TCP # client/server lookup protocol, see \fBtcp_table\fR(5). -# This feature is not available up to and including Postfix version 2.3. +# This feature is not available up to and including Postfix version 2.4. # # Each lookup operation uses the entire address once. Thus, # \fIuser@domain\fR mail addresses are not broken up into their diff --git a/postfix/proto/generic b/postfix/proto/generic index d19dfde45..e87029c87 100644 --- a/postfix/proto/generic +++ b/postfix/proto/generic @@ -130,7 +130,7 @@ # This section describes how the table lookups change when lookups # are directed to a TCP-based server. For a description of the TCP # client/server lookup protocol, see \fBtcp_table\fR(5). -# This feature is not available up to and including Postfix version 2.3. +# This feature is not available up to and including Postfix version 2.4. # # Each lookup operation uses the entire address once. Thus, # \fIuser@domain\fR mail addresses are not broken up into their diff --git a/postfix/proto/relocated b/postfix/proto/relocated index f1e1fe55b..332911b3e 100644 --- a/postfix/proto/relocated +++ b/postfix/proto/relocated @@ -82,7 +82,7 @@ # expression lookup table syntax, see \fBregexp_table\fR(5) or # \fBpcre_table\fR(5). For a description of the TCP client/server # table lookup protocol, see \fBtcp_table\fR(5). -# This feature is not available up to and including Postfix version 2.3. +# This feature is not available up to and including Postfix version 2.4. # # Each pattern is a regular expression that is applied to the entire # address being looked up. Thus, \fIuser@domain\fR mail addresses are not @@ -101,7 +101,7 @@ # This section describes how the table lookups change when lookups # are directed to a TCP-based server. For a description of the TCP # client/server lookup protocol, see \fBtcp_table\fR(5). -# This feature is not available up to and including Postfix version 2.3. +# This feature is not available up to and including Postfix version 2.4. # # Each lookup operation uses the entire address once. Thus, # \fIuser@domain\fR mail addresses are not broken up into their diff --git a/postfix/proto/transport b/postfix/proto/transport index f6d6fd502..e06cfb639 100644 --- a/postfix/proto/transport +++ b/postfix/proto/transport @@ -229,7 +229,7 @@ # This section describes how the table lookups change when lookups # are directed to a TCP-based server. For a description of the TCP # client/server lookup protocol, see \fBtcp_table\fR(5). -# This feature is not available up to and including Postfix version 2.3. +# This feature is not available up to and including Postfix version 2.4. # # Each lookup operation uses the entire recipient address once. Thus, # \fIsome.domain.hierarchy\fR is not looked up via its parent domains, diff --git a/postfix/proto/virtual b/postfix/proto/virtual index 2ec87104b..971e3c713 100644 --- a/postfix/proto/virtual +++ b/postfix/proto/virtual @@ -199,7 +199,7 @@ # This section describes how the table lookups change when lookups # are directed to a TCP-based server. For a description of the TCP # client/server lookup protocol, see \fBtcp_table\fR(5). -# This feature is not available up to and including Postfix version 2.3. +# This feature is not available up to and including Postfix version 2.4. # # Each lookup operation uses the entire address once. Thus, # \fIuser@domain\fR mail addresses are not broken up into their diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h index 9021b5dca..f62b93089 100644 --- a/postfix/src/global/mail_version.h +++ b/postfix/src/global/mail_version.h @@ -20,8 +20,8 @@ * Patches change both the patchlevel and the release date. Snapshots have no * patchlevel; they change the release date only. */ -#define MAIL_RELEASE_DATE "20070228" -#define MAIL_VERSION_NUMBER "2.4.0-RC1" +#define MAIL_RELEASE_DATE "20070301" +#define MAIL_VERSION_NUMBER "2.4.0-RC2" #ifdef SNAPSHOT # define MAIL_VERSION_DATE "-" MAIL_RELEASE_DATE diff --git a/postfix/src/master/multi_server.c b/postfix/src/master/multi_server.c index c4dbb5c7d..b007986e6 100644 --- a/postfix/src/master/multi_server.c +++ b/postfix/src/master/multi_server.c @@ -393,7 +393,7 @@ static void multi_server_accept_local(int unused_event, char *context) msg_fatal("select unlock: %m"); if (fd < 0) { if (errno != EAGAIN) - msg_fatal("accept connection: %m"); + msg_error("accept connection: %m"); if (time_left >= 0) event_request_timer(multi_server_timeout, (char *) 0, time_left); return; @@ -430,7 +430,7 @@ static void multi_server_accept_pass(int unused_event, char *context) msg_fatal("select unlock: %m"); if (fd < 0) { if (errno != EAGAIN) - msg_fatal("accept connection: %m"); + msg_error("accept connection: %m"); if (time_left >= 0) event_request_timer(multi_server_timeout, (char *) 0, time_left); return; @@ -467,7 +467,7 @@ static void multi_server_accept_inet(int unused_event, char *context) msg_fatal("select unlock: %m"); if (fd < 0) { if (errno != EAGAIN) - msg_fatal("accept connection: %m"); + msg_error("accept connection: %m"); if (time_left >= 0) event_request_timer(multi_server_timeout, (char *) 0, time_left); return; diff --git a/postfix/src/master/single_server.c b/postfix/src/master/single_server.c index 7e67eaa57..e22048f2b 100644 --- a/postfix/src/master/single_server.c +++ b/postfix/src/master/single_server.c @@ -291,7 +291,7 @@ static void single_server_accept_local(int unused_event, char *context) msg_fatal("select unlock: %m"); if (fd < 0) { if (errno != EAGAIN) - msg_fatal("accept connection: %m"); + msg_error("accept connection: %m"); if (time_left >= 0) event_request_timer(single_server_timeout, (char *) 0, time_left); return; @@ -327,7 +327,7 @@ static void single_server_accept_pass(int unused_event, char *context) msg_fatal("select unlock: %m"); if (fd < 0) { if (errno != EAGAIN) - msg_fatal("accept connection: %m"); + msg_error("accept connection: %m"); if (time_left >= 0) event_request_timer(single_server_timeout, (char *) 0, time_left); return; @@ -363,7 +363,7 @@ static void single_server_accept_inet(int unused_event, char *context) msg_fatal("select unlock: %m"); if (fd < 0) { if (errno != EAGAIN) - msg_fatal("accept connection: %m"); + msg_error("accept connection: %m"); if (time_left >= 0) event_request_timer(single_server_timeout, (char *) 0, time_left); return; diff --git a/postfix/src/util/inet_listen.c b/postfix/src/util/inet_listen.c index 2c610a301..72f277cc3 100644 --- a/postfix/src/util/inet_listen.c +++ b/postfix/src/util/inet_listen.c @@ -161,5 +161,8 @@ int inet_listen(const char *addr, int backlog, int block_mode) int inet_accept(int fd) { - return (sane_accept(fd, (struct sockaddr *) 0, (SOCKADDR_SIZE *) 0)); + struct sockaddr_storage ss; + SOCKADDR_SIZE ss_len = sizeof(ss); + + return (sane_accept(fd, (struct sockaddr *) & ss, &ss_len)); } diff --git a/postfix/src/util/sane_accept.c b/postfix/src/util/sane_accept.c index a4560c2c5..d158f5e9f 100644 --- a/postfix/src/util/sane_accept.c +++ b/postfix/src/util/sane_accept.c @@ -108,7 +108,7 @@ int sane_accept(int sock, struct sockaddr * sa, SOCKADDR_SIZE *len) * timer. */ #if defined(BROKEN_READ_SELECT_ON_TCP_SOCKET) && defined(SO_KEEPALIVE) - else if (sa != 0 && sa->sa_family == AF_INET) { + else if (sa && (sa->sa_family == AF_INET || sa->sa_family == AF_INET6)) { int on = 1; (void) setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE,