From: Wietse Venema Date: Sat, 3 Jan 2009 05:00:00 +0000 (-0500) Subject: postfix-2.5.6 X-Git-Tag: v2.5.6^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=575d50e0e374108187698512a997796f82e0ff84;p=thirdparty%2Fpostfix.git postfix-2.5.6 --- diff --git a/postfix/HISTORY b/postfix/HISTORY index cc6c1575b..7d2524664 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -13248,7 +13248,7 @@ Apologies for any names omitted. cleanup/cleanup_final.c, cleanup/cleanup_bounce.c, cleanup/cleanup_api.c. -20050217 +20070217 Streamline the compile time selection of event handling styles, replacing multiple on/off macros by just one @@ -14441,3 +14441,31 @@ Apologies for any names omitted. implement a denial of service attack on Postfix. Data confidentiality and integrity are not affected. File: util/events.c. + +20081022 + + Documentation: removed inapplicable daemon_timeout reference + from qmgr(8), oqmgr(8), pickup(8). These daemons need to + use a much shorter watchdog timer. + +20081108 + + Bugfix (introduced Postfix 2.5): the Postfix SMTP server + did not ask for a client certificate with "smtpd_tls_req_ccert + = yes". Reported by Rob Foehl. File: smtpd/smtpd.c. + +20081126 + + Documentation: pcre_table(5) incorrectly claimed that the + 'x' flag supports #comment after text. File: proto/pcre_table. + +20081203 + + Cleanup: adjust the VSTREAM buffer strategy when reusing + an SMTP connection with a large TCP MSS value. File: + smtp/smtp_reuse.c. + +20081222 + + Documentation: log the "*" pattern as the last transport + map lookup. File: proto/transport. diff --git a/postfix/conf/transport b/postfix/conf/transport index 07d7c345d..0544b2779 100644 --- a/postfix/conf/transport +++ b/postfix/conf/transport @@ -121,83 +121,85 @@ # ting. Otherwise, a domain name matches itself and # its subdomains. # -# Note 1: the special pattern * represents any address (i.e. -# it functions as the wild-card pattern). +# * transport:nexthop +# The special pattern * represents any address (i.e. +# it functions as the wild-card pattern, and is +# unique to Postfix transport tables). # -# Note 2: the null recipient address is looked up as +# Note 1: the null recipient address is looked up as # $empty_address_recipient@$myhostname (default: mailer-dae- # mon@hostname). # -# Note 3: user@domain or user+extension@domain lookup is +# Note 2: user@domain or user+extension@domain lookup is # available in Postfix 2.0 and later. # # RESULT FORMAT -# The lookup result is of the form transport:nexthop. The -# transport field specifies a mail delivery transport such -# as smtp or local. The nexthop field specifies where and +# The lookup result is of the form transport:nexthop. The +# transport field specifies a mail delivery transport such +# as smtp or local. The nexthop field specifies where and # how to deliver mail. # -# The transport field specifies the name of a mail delivery +# The transport field specifies the name of a mail delivery # transport (the first name of a mail delivery service entry # in the Postfix master.cf file). # -# The interpretation of the nexthop field is transport -# dependent. In the case of SMTP, specify a service on a -# non-default port as host:service, and disable MX (mail -# exchanger) DNS lookups with [host] or [host]:port. The [] +# The interpretation of the nexthop field is transport +# dependent. In the case of SMTP, specify a service on a +# non-default port as host:service, and disable MX (mail +# exchanger) DNS lookups with [host] or [host]:port. The [] # form is required when you specify an IP address instead of # a hostname. # -# A null transport and null nexthop result means "do not -# change": use the delivery transport and nexthop informa- -# tion that would be used when the entire transport table +# A null transport and null nexthop result means "do not +# change": use the delivery transport and nexthop informa- +# tion that would be used when the entire transport table # did not exist. # -# A non-null transport field with a null nexthop field +# A non-null transport field with a null nexthop field # resets the nexthop information to the recipient domain. # -# A null transport field with non-null nexthop field does +# A null transport field with non-null nexthop field does # not modify the transport information. # # EXAMPLES -# In order to deliver internal mail directly, while using a -# mail relay for all other mail, specify a null entry for -# internal destinations (do not change the delivery trans- -# port or the nexthop information) and specify a wildcard +# In order to deliver internal mail directly, while using a +# mail relay for all other mail, specify a null entry for +# internal destinations (do not change the delivery trans- +# port or the nexthop information) and specify a wildcard # for all other destinations. # # my.domain : # .my.domain : # * smtp:outbound-relay.my.domain # -# In order to send mail for example.com and its subdomains +# In order to send mail for example.com and its subdomains # via the uucp transport to the UUCP host named example: # # example.com uucp:example # .example.com uucp:example # -# When no nexthop host name is specified, the destination -# domain name is used instead. For example, the following -# directs mail for user@example.com via the slow transport -# to a mail exchanger for example.com. The slow transport +# When no nexthop host name is specified, the destination +# domain name is used instead. For example, the following +# directs mail for user@example.com via the slow transport +# to a mail exchanger for example.com. The slow transport # could be configured to run at most one delivery process at # a time: # # example.com slow: # # When no transport is specified, Postfix uses the transport -# that matches the address domain class (see DESCRIPTION -# above). The following sends all mail for example.com and +# that matches the address domain class (see DESCRIPTION +# above). The following sends all mail for example.com and # its subdomains to host gateway.example.com: # # example.com :[gateway.example.com] # .example.com :[gateway.example.com] # -# In the above example, the [] suppress MX lookups. This -# prevents mail routing loops when your machine is primary +# In the above example, the [] suppress MX lookups. This +# prevents mail routing loops when your machine is primary # MX host for example.com. # -# In the case of delivery via SMTP, one may specify host- +# In the case of delivery via SMTP, one may specify host- # name:service instead of just a host: # # example.com smtp:bar.example:2025 @@ -211,55 +213,55 @@ # # .example.com error:mail for *.example.com is not deliverable # -# This causes all mail for user@anything.example.com to be +# This causes all mail for user@anything.example.com to be # bounced. # # REGULAR EXPRESSION TABLES -# This section describes how the table lookups change when +# This section describes how the table lookups change when # the table is given in the form of regular expressions. For -# a description of regular expression lookup table syntax, +# a description of regular expression lookup table syntax, # see regexp_table(5) or pcre_table(5). # -# Each pattern is a regular expression that is applied to -# the entire address being looked up. Thus, -# some.domain.hierarchy is not looked up via its parent -# domains, nor is user+foo@domain looked up as user@domain. +# Each pattern is a regular expression that is applied to +# the entire address being looked up. Thus, +# some.domain.hierarchy is not looked up via its parent +# domains, nor is user+foo@domain looked up as user@domain. # -# Patterns are applied in the order as specified in the ta- -# ble, until a pattern is found that matches the search +# Patterns are applied in the order as specified in the ta- +# ble, until a pattern is found that matches the search # string. # # The trivial-rewrite(8) server disallows regular expression -# substitution of $1 etc. in regular expression lookup -# tables, because that could open a security hole (Postfix +# substitution of $1 etc. in regular expression lookup +# tables, because that could open a security hole (Postfix # version 2.3 and later). # # TCP-BASED TABLES -# This section describes how the table lookups change when +# This section describes how the table lookups change when # 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.4. # -# Each lookup operation uses the entire recipient address -# once. Thus, some.domain.hierarchy is not looked up via -# its parent domains, nor is user+foo@domain looked up as +# Each lookup operation uses the entire recipient address +# once. Thus, some.domain.hierarchy is not looked up via +# its parent domains, nor is user+foo@domain looked up as # user@domain. # # Results are the same as with indexed file lookups. # # CONFIGURATION PARAMETERS -# The following main.cf parameters are especially relevant. -# The text below provides only a parameter summary. See +# The following main.cf parameters are especially relevant. +# The text below provides only a parameter summary. See # postconf(5) for more details including examples. # # empty_address_recipient -# The address that is looked up instead of the null +# The address that is looked up instead of the null # sender address. # # parent_domain_matches_subdomains -# List of Postfix features that use domain.tld pat- -# terns to match sub.domain.tld (as opposed to +# List of Postfix features that use domain.tld pat- +# terns to match sub.domain.tld (as opposed to # requiring .domain.tld patterns). # # transport_maps @@ -272,14 +274,14 @@ # postmap(1), Postfix lookup table manager # # README FILES -# Use "postconf readme_directory" or "postconf html_direc- +# Use "postconf readme_directory" or "postconf html_direc- # tory" to locate this information. # ADDRESS_REWRITING_README, address rewriting guide # DATABASE_README, Postfix lookup table overview # FILTER_README, external content filter # # LICENSE -# The Secure Mailer license must be distributed with this +# The Secure Mailer license must be distributed with this # software. # # AUTHOR(S) diff --git a/postfix/html/oqmgr.8.html b/postfix/html/oqmgr.8.html index 47e56ddb0..f952244e9 100644 --- a/postfix/html/oqmgr.8.html +++ b/postfix/html/oqmgr.8.html @@ -321,11 +321,6 @@ OQMGR(8) OQMGR(8) The default location of the Postfix main.cf and master.cf configuration files. - daemon_timeout (18000s) - How much time a Postfix daemon process may take to - handle a request before it is terminated by a - built-in watchdog timer. - defer_transports (empty) The names of message delivery transports that should not deliver mail unless someone issues diff --git a/postfix/html/pcre_table.5.html b/postfix/html/pcre_table.5.html index a80d3108e..9db86451e 100644 --- a/postfix/html/pcre_table.5.html +++ b/postfix/html/pcre_table.5.html @@ -110,12 +110,12 @@ PCRE_TABLE(5) PCRE_TABLE(5) x (default: off) Toggles the pcre extended flag. When this flag is - on, whitespace in the pattern (other than in a - character class) and characters between a # outside - a character class and the next newline character - are ignored. An escaping backslash can be used to - include a whitespace or # character as part of the - pattern. + on, whitespace characters in the pattern (other + than in a character class) are ignored. To include + a whitespace character as part of the pattern, + escape it with backslash. + + Note: do not use #comment after patterns. A (default: off) Toggles the PCRE_ANCHORED flag. When this flag is diff --git a/postfix/html/pickup.8.html b/postfix/html/pickup.8.html index b4f72d493..07bb66863 100644 --- a/postfix/html/pickup.8.html +++ b/postfix/html/pickup.8.html @@ -65,11 +65,6 @@ PICKUP(8) PICKUP(8) The default location of the Postfix main.cf and master.cf configuration files. - daemon_timeout (18000s) - How much time a Postfix daemon process may take to - handle a request before it is terminated by a - built-in watchdog timer. - ipc_timeout (3600s) The time limit for sending or receiving information over an internal communication channel. diff --git a/postfix/html/qmgr.8.html b/postfix/html/qmgr.8.html index 4a2b26783..891ce3be2 100644 --- a/postfix/html/qmgr.8.html +++ b/postfix/html/qmgr.8.html @@ -393,11 +393,6 @@ QMGR(8) QMGR(8) The default location of the Postfix main.cf and master.cf configuration files. - daemon_timeout (18000s) - How much time a Postfix daemon process may take to - handle a request before it is terminated by a - built-in watchdog timer. - defer_transports (empty) The names of message delivery transports that should not deliver mail unless someone issues diff --git a/postfix/html/transport.5.html b/postfix/html/transport.5.html index 35abc32c5..749c6c1db 100644 --- a/postfix/html/transport.5.html +++ b/postfix/html/transport.5.html @@ -127,83 +127,85 @@ TRANSPORT(5) TRANSPORT(5) ting. Otherwise, a domain name matches itself and its subdomains. - Note 1: the special pattern * represents any address (i.e. - it functions as the wild-card pattern). + * transport:nexthop + The special pattern * represents any address (i.e. + it functions as the wild-card pattern, and is + unique to Postfix transport tables). - Note 2: the null recipient address is looked up as + Note 1: the null recipient address is looked up as $empty_address_recipient@$myhostname (default: mailer-dae- mon@hostname). - Note 3: user@domain or user+extension@domain lookup is + Note 2: user@domain or user+extension@domain lookup is available in Postfix 2.0 and later. RESULT FORMAT - The lookup result is of the form transport:nexthop. The - transport field specifies a mail delivery transport such - as smtp or local. The nexthop field specifies where and + The lookup result is of the form transport:nexthop. The + transport field specifies a mail delivery transport such + as smtp or local. The nexthop field specifies where and how to deliver mail. - The transport field specifies the name of a mail delivery + The transport field specifies the name of a mail delivery transport (the first name of a mail delivery service entry in the Postfix master.cf file). - The interpretation of the nexthop field is transport - dependent. In the case of SMTP, specify a service on a - non-default port as host:service, and disable MX (mail - exchanger) DNS lookups with [host] or [host]:port. The [] + The interpretation of the nexthop field is transport + dependent. In the case of SMTP, specify a service on a + non-default port as host:service, and disable MX (mail + exchanger) DNS lookups with [host] or [host]:port. The [] form is required when you specify an IP address instead of a hostname. - A null transport and null nexthop result means "do not - change": use the delivery transport and nexthop informa- - tion that would be used when the entire transport table + A null transport and null nexthop result means "do not + change": use the delivery transport and nexthop informa- + tion that would be used when the entire transport table did not exist. - A non-null transport field with a null nexthop field + A non-null transport field with a null nexthop field resets the nexthop information to the recipient domain. - A null transport field with non-null nexthop field does + A null transport field with non-null nexthop field does not modify the transport information. EXAMPLES - In order to deliver internal mail directly, while using a - mail relay for all other mail, specify a null entry for - internal destinations (do not change the delivery trans- - port or the nexthop information) and specify a wildcard + In order to deliver internal mail directly, while using a + mail relay for all other mail, specify a null entry for + internal destinations (do not change the delivery trans- + port or the nexthop information) and specify a wildcard for all other destinations. my.domain : .my.domain : * smtp:outbound-relay.my.domain - In order to send mail for example.com and its subdomains + In order to send mail for example.com and its subdomains via the uucp transport to the UUCP host named example: example.com uucp:example .example.com uucp:example - When no nexthop host name is specified, the destination - domain name is used instead. For example, the following - directs mail for user@example.com via the slow transport - to a mail exchanger for example.com. The slow transport + When no nexthop host name is specified, the destination + domain name is used instead. For example, the following + directs mail for user@example.com via the slow transport + to a mail exchanger for example.com. The slow transport could be configured to run at most one delivery process at a time: example.com slow: When no transport is specified, Postfix uses the transport - that matches the address domain class (see DESCRIPTION - above). The following sends all mail for example.com and + that matches the address domain class (see DESCRIPTION + above). The following sends all mail for example.com and its subdomains to host gateway.example.com: example.com :[gateway.example.com] .example.com :[gateway.example.com] - In the above example, the [] suppress MX lookups. This - prevents mail routing loops when your machine is primary + In the above example, the [] suppress MX lookups. This + prevents mail routing loops when your machine is primary MX host for example.com. - In the case of delivery via SMTP, one may specify host- + In the case of delivery via SMTP, one may specify host- name:service instead of just a host: example.com smtp:bar.example:2025 @@ -217,55 +219,55 @@ TRANSPORT(5) TRANSPORT(5) .example.com error:mail for *.example.com is not deliverable - This causes all mail for user@anything.example.com to be + This causes all mail for user@anything.example.com to be bounced. REGULAR EXPRESSION TABLES - This section describes how the table lookups change when + This section describes how the table lookups change when the table is given in the form of regular expressions. For - a description of regular expression lookup table syntax, + a description of regular expression lookup table syntax, see regexp_table(5) or pcre_table(5). - Each pattern is a regular expression that is applied to - the entire address being looked up. Thus, - some.domain.hierarchy is not looked up via its parent - domains, nor is user+foo@domain looked up as user@domain. + Each pattern is a regular expression that is applied to + the entire address being looked up. Thus, + some.domain.hierarchy is not looked up via its parent + domains, nor is user+foo@domain looked up as user@domain. - Patterns are applied in the order as specified in the ta- - ble, until a pattern is found that matches the search + Patterns are applied in the order as specified in the ta- + ble, until a pattern is found that matches the search string. The trivial-rewrite(8) server disallows regular expression - substitution of $1 etc. in regular expression lookup - tables, because that could open a security hole (Postfix + substitution of $1 etc. in regular expression lookup + tables, because that could open a security hole (Postfix version 2.3 and later). TCP-BASED TABLES - This section describes how the table lookups change when + This section describes how the table lookups change when 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.4. - Each lookup operation uses the entire recipient address - once. Thus, some.domain.hierarchy is not looked up via - its parent domains, nor is user+foo@domain looked up as + Each lookup operation uses the entire recipient address + once. Thus, some.domain.hierarchy is not looked up via + its parent domains, nor is user+foo@domain looked up as user@domain. Results are the same as with indexed file lookups. CONFIGURATION PARAMETERS - The following main.cf parameters are especially relevant. - The text below provides only a parameter summary. See + The following main.cf parameters are especially relevant. + The text below provides only a parameter summary. See postconf(5) for more details including examples. empty_address_recipient - The address that is looked up instead of the null + The address that is looked up instead of the null sender address. parent_domain_matches_subdomains - List of Postfix features that use domain.tld pat- - terns to match sub.domain.tld (as opposed to + List of Postfix features that use domain.tld pat- + terns to match sub.domain.tld (as opposed to requiring .domain.tld patterns). transport_maps @@ -283,7 +285,7 @@ TRANSPORT(5) TRANSPORT(5) FILTER_README, external content filter LICENSE - The Secure Mailer license must be distributed with this + The Secure Mailer license must be distributed with this software. AUTHOR(S) diff --git a/postfix/man/man5/pcre_table.5 b/postfix/man/man5/pcre_table.5 index c3c008fb1..f7b57a187 100644 --- a/postfix/man/man5/pcre_table.5 +++ b/postfix/man/man5/pcre_table.5 @@ -100,11 +100,11 @@ default, which is inconvenient for multi-line message header matching. .IP "\fBx\fR (default: off)" Toggles the pcre extended flag. When this flag is on, whitespace -in the pattern (other than in a character class) and -characters between a \fB#\fR outside a character class and -the next newline character are ignored. An escaping backslash -can be used to include a whitespace or \fB#\fR character -as part of the pattern. +characters in the pattern (other than in a character class) +are ignored. To include a whitespace character as part of +the pattern, escape it with backslash. +.sp +Note: do not use \fB#\fIcomment\fR after patterns. .IP "\fBA\fR (default: off)" Toggles the PCRE_ANCHORED flag. When this flag is on, the pattern is forced to be "anchored", that is, it is diff --git a/postfix/man/man5/transport.5 b/postfix/man/man5/transport.5 index 24a211808..9f76856b0 100644 --- a/postfix/man/man5/transport.5 +++ b/postfix/man/man5/transport.5 @@ -118,15 +118,16 @@ Deliver mail for any subdomain of \fIdomain\fR through string \fBtransport_maps\fR is not listed in the \fBparent_domain_matches_subdomains\fR configuration setting. Otherwise, a domain name matches itself and its subdomains. +.IP "\fB*\fI transport\fR:\fInexthop\fR" +The special pattern \fB*\fR represents any address (i.e. it +functions as the wild-card pattern, and is unique to Postfix +transport tables). .PP -Note 1: the special pattern \fB*\fR represents any address (i.e. it -functions as the wild-card pattern). - -Note 2: the null recipient address is looked up as +Note 1: the null recipient address is looked up as \fB$empty_address_recipient\fR@\fB$myhostname\fR (default: mailer-daemon@hostname). -Note 3: \fIuser@domain\fR or \fIuser+extension@domain\fR +Note 2: \fIuser@domain\fR or \fIuser+extension@domain\fR lookup is available in Postfix 2.0 and later. .SH "RESULT FORMAT" .na diff --git a/postfix/man/man8/oqmgr.8 b/postfix/man/man8/oqmgr.8 index 0196a3abc..5be3f42fc 100644 --- a/postfix/man/man8/oqmgr.8 +++ b/postfix/man/man8/oqmgr.8 @@ -287,9 +287,6 @@ Idem, for delivery via the named message \fItransport\fR. .IP "\fBconfig_directory (see 'postconf -d' output)\fR" The default location of the Postfix main.cf and master.cf configuration files. -.IP "\fBdaemon_timeout (18000s)\fR" -How much time a Postfix daemon process may take to handle a -request before it is terminated by a built-in watchdog timer. .IP "\fBdefer_transports (empty)\fR" The names of message delivery transports that should not deliver mail unless someone issues "\fBsendmail -q\fR" or equivalent. diff --git a/postfix/man/man8/pickup.8 b/postfix/man/man8/pickup.8 index 2c7204091..c79250f12 100644 --- a/postfix/man/man8/pickup.8 +++ b/postfix/man/man8/pickup.8 @@ -77,9 +77,6 @@ filtering, or address mapping. .IP "\fBconfig_directory (see 'postconf -d' output)\fR" The default location of the Postfix main.cf and master.cf configuration files. -.IP "\fBdaemon_timeout (18000s)\fR" -How much time a Postfix daemon process may take to handle a -request before it is terminated by a built-in watchdog timer. .IP "\fBipc_timeout (3600s)\fR" The time limit for sending or receiving information over an internal communication channel. diff --git a/postfix/man/man8/qmgr.8 b/postfix/man/man8/qmgr.8 index 610c4ee63..0252679b3 100644 --- a/postfix/man/man8/qmgr.8 +++ b/postfix/man/man8/qmgr.8 @@ -337,9 +337,6 @@ Idem, for delivery via the named message \fItransport\fR. .IP "\fBconfig_directory (see 'postconf -d' output)\fR" The default location of the Postfix main.cf and master.cf configuration files. -.IP "\fBdaemon_timeout (18000s)\fR" -How much time a Postfix daemon process may take to handle a -request before it is terminated by a built-in watchdog timer. .IP "\fBdefer_transports (empty)\fR" The names of message delivery transports that should not deliver mail unless someone issues "\fBsendmail -q\fR" or equivalent. diff --git a/postfix/proto/pcre_table b/postfix/proto/pcre_table index 679e67ef7..3c21a4ade 100644 --- a/postfix/proto/pcre_table +++ b/postfix/proto/pcre_table @@ -90,11 +90,11 @@ # matching. # .IP "\fBx\fR (default: off)" # Toggles the pcre extended flag. When this flag is on, whitespace -# in the pattern (other than in a character class) and -# characters between a \fB#\fR outside a character class and -# the next newline character are ignored. An escaping backslash -# can be used to include a whitespace or \fB#\fR character -# as part of the pattern. +# characters in the pattern (other than in a character class) +# are ignored. To include a whitespace character as part of +# the pattern, escape it with backslash. +# .sp +# Note: do not use \fB#\fIcomment\fR after patterns. # .IP "\fBA\fR (default: off)" # Toggles the PCRE_ANCHORED flag. When this flag is on, # the pattern is forced to be "anchored", that is, it is diff --git a/postfix/proto/transport b/postfix/proto/transport index aa69b6450..e411e3046 100644 --- a/postfix/proto/transport +++ b/postfix/proto/transport @@ -106,15 +106,16 @@ # string \fBtransport_maps\fR is not listed in the # \fBparent_domain_matches_subdomains\fR configuration setting. # Otherwise, a domain name matches itself and its subdomains. +# .IP "\fB*\fI transport\fR:\fInexthop\fR" +# The special pattern \fB*\fR represents any address (i.e. it +# functions as the wild-card pattern, and is unique to Postfix +# transport tables). # .PP -# Note 1: the special pattern \fB*\fR represents any address (i.e. it -# functions as the wild-card pattern). -# -# Note 2: the null recipient address is looked up as +# Note 1: the null recipient address is looked up as # \fB$empty_address_recipient\fR@\fB$myhostname\fR (default: # mailer-daemon@hostname). # -# Note 3: \fIuser@domain\fR or \fIuser+extension@domain\fR +# Note 2: \fIuser@domain\fR or \fIuser+extension@domain\fR # lookup is available in Postfix 2.0 and later. # RESULT FORMAT # .ad diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h index 695b591e4..251fb751b 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 "20080902" -#define MAIL_VERSION_NUMBER "2.5.5" +#define MAIL_RELEASE_DATE "20090103" +#define MAIL_VERSION_NUMBER "2.5.6" #ifdef SNAPSHOT # define MAIL_VERSION_DATE "-" MAIL_RELEASE_DATE diff --git a/postfix/src/oqmgr/qmgr.c b/postfix/src/oqmgr/qmgr.c index e6b7a2cf0..1a8b8b241 100644 --- a/postfix/src/oqmgr/qmgr.c +++ b/postfix/src/oqmgr/qmgr.c @@ -253,9 +253,6 @@ /* .IP "\fBconfig_directory (see 'postconf -d' output)\fR" /* The default location of the Postfix main.cf and master.cf /* configuration files. -/* .IP "\fBdaemon_timeout (18000s)\fR" -/* How much time a Postfix daemon process may take to handle a -/* request before it is terminated by a built-in watchdog timer. /* .IP "\fBdefer_transports (empty)\fR" /* The names of message delivery transports that should not deliver mail /* unless someone issues "\fBsendmail -q\fR" or equivalent. diff --git a/postfix/src/pickup/pickup.c b/postfix/src/pickup/pickup.c index 526281826..bf25b63db 100644 --- a/postfix/src/pickup/pickup.c +++ b/postfix/src/pickup/pickup.c @@ -57,9 +57,6 @@ /* .IP "\fBconfig_directory (see 'postconf -d' output)\fR" /* The default location of the Postfix main.cf and master.cf /* configuration files. -/* .IP "\fBdaemon_timeout (18000s)\fR" -/* How much time a Postfix daemon process may take to handle a -/* request before it is terminated by a built-in watchdog timer. /* .IP "\fBipc_timeout (3600s)\fR" /* The time limit for sending or receiving information over an internal /* communication channel. diff --git a/postfix/src/qmgr/qmgr.c b/postfix/src/qmgr/qmgr.c index 59bafb8b6..f147e63e0 100644 --- a/postfix/src/qmgr/qmgr.c +++ b/postfix/src/qmgr/qmgr.c @@ -299,9 +299,6 @@ /* .IP "\fBconfig_directory (see 'postconf -d' output)\fR" /* The default location of the Postfix main.cf and master.cf /* configuration files. -/* .IP "\fBdaemon_timeout (18000s)\fR" -/* How much time a Postfix daemon process may take to handle a -/* request before it is terminated by a built-in watchdog timer. /* .IP "\fBdefer_transports (empty)\fR" /* The names of message delivery transports that should not deliver mail /* unless someone issues "\fBsendmail -q\fR" or equivalent. diff --git a/postfix/src/smtp/smtp_reuse.c b/postfix/src/smtp/smtp_reuse.c index 1ed72d73b..0eb989f18 100644 --- a/postfix/src/smtp/smtp_reuse.c +++ b/postfix/src/smtp/smtp_reuse.c @@ -213,6 +213,11 @@ static SMTP_SESSION *smtp_reuse_common(SMTP_STATE *state, int fd, return (state->session = 0); } + /* + * Avoid poor performance when TCP MSS > VSTREAM_BUFSIZE. + */ + vstream_tweak_sock(session->stream); + /* * Update the list of used cached addresses. */ diff --git a/postfix/src/smtpd/smtpd.c b/postfix/src/smtpd/smtpd.c index ef17a1d8d..7feab8a8a 100644 --- a/postfix/src/smtpd/smtpd.c +++ b/postfix/src/smtpd/smtpd.c @@ -4551,7 +4551,7 @@ static void pre_jail_init(char *unused_name, char **unused_argv) = var_smtpd_tls_dh512_param_file, protocols = enforce_tls ? var_smtpd_tls_mand_proto : "", - ask_ccert = var_smtpd_tls_ask_ccert, + ask_ccert = wantcert, fpt_dgst = var_smtpd_tls_fpt_dgst); else msg_warn("No server certs available. TLS won't be enabled");