mir/postfix
2
0
Fork 0
mirror of https://github.com/vdukhovni/postfix synced 2025-08-22 09:57:34 +00:00
Code Issues Releases Wiki Activity

postfix-2.8-20100707

Browse Source
This commit is contained in:
Wietse Venema 2010-07-07 00:00:00 -05:00 committed by Viktor Dukhovni
parent 2cee07704f
commit bd2811a2ed
20 changed files with 140 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
postfix/HISTORY
View File

@ -15823,11 +15823,12 @@ Apologies for any names omitted.
20100610 20100610
Bugfix: Postfix no longer appends the system default CAs Bugfix (introduced Postfix 2.2): Postfix no longer appends
to the lists specified with *_tls_CAfile or with *_tls_CApath. the system default CA certificates to the lists specified
This prevents third-party certificates from being trusted with *_tls_CAfile or with *_tls_CApath. This prevents
and given mail relay permission with permit_tls_all_clientcerts. third-party certificates from being trusted and given mail
This change may break valid configurations that do not use relay permission with permit_tls_all_clientcerts. This
change may break valid configurations that do not use
permit_tls_all_clientcerts. To get the old behavior, specify permit_tls_all_clientcerts. To get the old behavior, specify
"tls_append_default_CA = yes". Files: tls/tls_certkey.c, "tls_append_default_CA = yes". Files: tls/tls_certkey.c,
tls/tls_misc.c, global/mail_params.h. proto/postconf.proto, tls/tls_misc.c, global/mail_params.h. proto/postconf.proto,
@ -15855,3 +15856,7 @@ Apologies for any names omitted.
Cleanup: SQLite read-only driver and documentation. Files: Cleanup: SQLite read-only driver and documentation. Files:
global/dict_sqlite.c, proto/mysql_table, proto/SQLITE_README.html. global/dict_sqlite.c, proto/mysql_table, proto/SQLITE_README.html.
20100707
Completed the 20100610 bugfix. File: tls/tls_misc.c.

37
postfix/README_FILES/LDAP_README
View File

@ -232,8 +232,8 @@ settings, timeouts, ...) we have:
search_base = dc=example, dc=com search_base = dc=example, dc=com
query_filter = mail=%s query_filter = mail=%s
result_attribute = memberaddr result_attribute = memberaddr
$ postmap -q agroup@example.com ldap:simple.cf $ postmap -q agroup@example.com ldap:/etc/postfix/simple.cf \
auser@example.org,buser@example.org auser@example.org,buser@example.org
We search "dc=example, dc=com". The "mail" attribute is used in the We search "dc=example, dc=com". The "mail" attribute is used in the
query_filter to locate the right group, the "result_attribute" setting query_filter to locate the right group, the "result_attribute" setting
@ -261,8 +261,8 @@ example data.
query_filter = mail=%s query_filter = mail=%s
result_attribute = maildrop result_attribute = maildrop
special_result_attribute = memberdn special_result_attribute = memberdn
$ postmap -q agroup@example.com ldap:special.cf $ postmap -q agroup@example.com ldap:/etc/postfix/special.cf \
auser@mailhub.example.com,buser@mailhub.example.com auser@mailhub.example.com,buser@mailhub.example.com
Note: if the desired member object result attribute is always also present in Note: if the desired member object result attribute is always also present in
the group, you get surprising results: the expansion also returns the address the group, you get surprising results: the expansion also returns the address
@ -288,12 +288,15 @@ expanded.
query_filter = mail=%s query_filter = mail=%s
result_attribute = maildrop result_attribute = maildrop
special_result_attribute = memberdn special_result_attribute = memberdn
$ postmap -q auser@example.com ldap:no_expand.cf ldap:expand.cf $ postmap -q auser@example.com \
auser@mailhub.example.com ldap:/etc/postfix/no_expand.cf ldap:/etc/postfix/expand.cf \
$ postmap -q agroup@example.com ldap:no_expand.cf ldap:expand.cf auser@mailhub.example.com
auser@mailhub.example.com,buser@mailhub.example.com $ postmap -q agroup@example.com \
$ postmap -q bgroup@example.com ldap:no_expand.cf ldap:expand.cf ldap:/etc/postfix/no_expand.cf ldap:/etc/postfix/expand.cf \
bgroup@mlm.example.com auser@mailhub.example.com,buser@mailhub.example.com
$ postmap -q bgroup@example.com \
ldap:/etc/postfix/no_expand.cf ldap:/etc/postfix/expand.cf \
bgroup@mlm.example.com
Non-group objects and groups with delayed expansion (those that have a maildrop Non-group objects and groups with delayed expansion (those that have a maildrop
attribute) are rewritten to a single maildrop value. Groups that don't have a attribute) are rewritten to a single maildrop value. Groups that don't have a
@ -312,15 +315,15 @@ assume that forwarded groups are never nested inside expanded groups.
special_result_attribute = memberdn special_result_attribute = memberdn
terminal_result_attribute = maildrop terminal_result_attribute = maildrop
leaf_result_attribute = mail leaf_result_attribute = mail
$ postmap -q auser@example.com ldap:fancy.cf $ postmap -q auser@example.com ldap:/etc/postfix/fancy.cf \
auser@mailhub.example.com auser@mailhub.example.com
$ postmap -q cuser@example.com ldap:fancy.cf $ postmap -q cuser@example.com ldap:/etc/postfix/fancy.cf \
cuser@example.com cuser@example.com
$ postmap -q agroup@example.com ldap:fancy.cf $ postmap -q agroup@example.com ldap:/etc/postfix/fancy.cf \
auser@mailhub.example.com,buser@mailhub.example.com,auser@example.org,buser@example.org auser@mailhub.example.com,buser@mailhub.example.com,auser@example.org,buser@example.org
$ postmap -q bgroup@example.com ldap:fancy.cf $ postmap -q bgroup@example.com ldap:/etc/postfix/fancy.cf \
bgroup@mlm.example.com bgroup@mlm.example.com
Above, delayed expansion is enabled via "terminal_result_attribute", which, if Above, delayed expansion is enabled via "terminal_result_attribute", which, if
present, is used as the sole result and all other expansion is suppressed. present, is used as the sole result and all other expansion is suppressed.

7
postfix/README_FILES/QSHAPE_README
View File

@ -366,6 +366,7 @@ delivery attempts.
/etc/postfix/main.cf: /etc/postfix/main.cf:
transport_maps = hash:/etc/postfix/transport transport_maps = hash:/etc/postfix/transport
slow_destination_rate_delay = 1 slow_destination_rate_delay = 1
slow_destination_concurrency_failed_cohort_limit = 100
/etc/postfix/transport: /etc/postfix/transport:
example.com slow: example.com slow:
@ -380,6 +381,12 @@ delivery attempts.
$slow_destination_rate_delay seconds between deliveries to the same $slow_destination_rate_delay seconds between deliveries to the same
destination. destination.
IMPORTANT!! The large slow_destination_concurrency_failed_cohort_limit
value is needed. This prevents Postfix from deferring all mail for the same
destination after only one connection or handshake error (the reason for
this is that non-zero slow_destination_rate_delay forces a per-destination
concurrency of 1).
* Earlier Postfix versions: * Earlier Postfix versions:
o In the transport map entry for the problem destination, specify a dead o In the transport map entry for the problem destination, specify a dead

8
postfix/RELEASE_NOTES
View File

@ -17,10 +17,10 @@ before proceeding.
Incompatibility with snapshot 20100610 Incompatibility with snapshot 20100610
====================================== ======================================
Postfix no longer appends the system-supplied default CAs to the Postfix no longer appends the system-supplied default CA certificates
lists specified with *_tls_CAfile or with *_tls_CApath. This prevents to the lists specified with *_tls_CAfile or with *_tls_CApath. This
third-party certificates from being trusted and given mail relay prevents third-party certificates from being trusted and given mail
permission with permit_tls_all_clientcerts. relay permission with permit_tls_all_clientcerts.
Unfortunately this change may break certificate verification on Unfortunately this change may break certificate verification on
sites that don't use permit_tls_all_clientcerts. Specify sites that don't use permit_tls_all_clientcerts. Specify

6
postfix/WISHLIST
View File

@ -2,6 +2,12 @@ Wish list:
Remove this file from the stable release. Remove this file from the stable release.
Update history in manpage/readme for SQLite driver.
Make postconf aware of magical suffixes (the ones that
combine with transport names) and show them in "postconf
-n" output. Making this work with "postconf -d" is trickier.
Need a regular expression table to translate address Need a regular expression table to translate address
verification responses into hard/soft/accept reply codes. verification responses into hard/soft/accept reply codes.

2
postfix/conf/postfix-files
View File

@ -280,6 +280,7 @@ $readme_directory/SCHEDULER_README:f:root:-:644
$readme_directory/SMTPD_ACCESS_README:f:root:-:644 $readme_directory/SMTPD_ACCESS_README:f:root:-:644
$readme_directory/SMTPD_POLICY_README:f:root:-:644 $readme_directory/SMTPD_POLICY_README:f:root:-:644
$readme_directory/SMTPD_PROXY_README:f:root:-:644 $readme_directory/SMTPD_PROXY_README:f:root:-:644
$readme_directory/SOHO_README:f:root:-:644
$readme_directory/STANDARD_CONFIGURATION_README:f:root:-:644 $readme_directory/STANDARD_CONFIGURATION_README:f:root:-:644
$readme_directory/STRESS_README:f:root:-:644 $readme_directory/STRESS_README:f:root:-:644
$readme_directory/TLS_LEGACY_README:f:root:-:644 $readme_directory/TLS_LEGACY_README:f:root:-:644
@ -330,6 +331,7 @@ $html_directory/SCHEDULER_README.html:f:root:-:644
$html_directory/SMTPD_ACCESS_README.html:f:root:-:644 $html_directory/SMTPD_ACCESS_README.html:f:root:-:644
$html_directory/SMTPD_POLICY_README.html:f:root:-:644 $html_directory/SMTPD_POLICY_README.html:f:root:-:644
$html_directory/SMTPD_PROXY_README.html:f:root:-:644 $html_directory/SMTPD_PROXY_README.html:f:root:-:644
$html_directory/SOHO_README.html:f:root:-:644
$html_directory/STANDARD_CONFIGURATION_README.html:f:root:-:644 $html_directory/STANDARD_CONFIGURATION_README.html:f:root:-:644
$html_directory/STRESS_README.html:f:root:-:644 $html_directory/STRESS_README.html:f:root:-:644
$html_directory/TLS_LEGACY_README.html:f:root:-:644 $html_directory/TLS_LEGACY_README.html:f:root:-:644

39
postfix/html/LDAP_README.html
View File

@ -336,8 +336,8 @@ related settings (hosts, ports, bind settings, timeouts, ...) we have:
search_base = dc=example, dc=com search_base = dc=example, dc=com
query_filter = mail=%s query_filter = mail=%s
result_attribute = memberaddr result_attribute = memberaddr
$ postmap -q agroup@example.com <a href="ldap_table.5.html">ldap</a>:simple.cf $ postmap -q agroup@example.com <a href="ldap_table.5.html">ldap</a>:/etc/postfix/simple.cf \
auser@example.org,buser@example.org auser@example.org,buser@example.org
</pre> </pre>
</blockquote> </blockquote>
@ -369,8 +369,8 @@ assume for the moment that groups never have a "maildrop" (the "bgroup"
query_filter = mail=%s query_filter = mail=%s
result_attribute = maildrop result_attribute = maildrop
special_result_attribute = memberdn special_result_attribute = memberdn
$ postmap -q agroup@example.com <a href="ldap_table.5.html">ldap</a>:special.cf $ postmap -q agroup@example.com <a href="ldap_table.5.html">ldap</a>:/etc/postfix/special.cf \
auser@mailhub.example.com,buser@mailhub.example.com auser@mailhub.example.com,buser@mailhub.example.com
</pre> </pre>
</blockquote> </blockquote>
@ -400,12 +400,15 @@ never nested members of groups that are directly expanded. </p>
query_filter = mail=%s query_filter = mail=%s
result_attribute = maildrop result_attribute = maildrop
special_result_attribute = memberdn special_result_attribute = memberdn
$ postmap -q auser@example.com <a href="ldap_table.5.html">ldap</a>:no_expand.cf <a href="ldap_table.5.html">ldap</a>:expand.cf $ postmap -q auser@example.com \
auser@mailhub.example.com <a href="ldap_table.5.html">ldap</a>:/etc/postfix/no_expand.cf <a href="ldap_table.5.html">ldap</a>:/etc/postfix/expand.cf \
$ postmap -q agroup@example.com <a href="ldap_table.5.html">ldap</a>:no_expand.cf <a href="ldap_table.5.html">ldap</a>:expand.cf auser@mailhub.example.com
auser@mailhub.example.com,buser@mailhub.example.com $ postmap -q agroup@example.com \
$ postmap -q bgroup@example.com <a href="ldap_table.5.html">ldap</a>:no_expand.cf <a href="ldap_table.5.html">ldap</a>:expand.cf <a href="ldap_table.5.html">ldap</a>:/etc/postfix/no_expand.cf <a href="ldap_table.5.html">ldap</a>:/etc/postfix/expand.cf \
bgroup@mlm.example.com auser@mailhub.example.com,buser@mailhub.example.com
$ postmap -q bgroup@example.com \
<a href="ldap_table.5.html">ldap</a>:/etc/postfix/no_expand.cf <a href="ldap_table.5.html">ldap</a>:/etc/postfix/expand.cf \
bgroup@mlm.example.com
</pre> </pre>
</blockquote> </blockquote>
@ -429,14 +432,14 @@ expanded groups. </p>
special_result_attribute = memberdn special_result_attribute = memberdn
terminal_result_attribute = maildrop terminal_result_attribute = maildrop
leaf_result_attribute = mail leaf_result_attribute = mail
$ postmap -q auser@example.com <a href="ldap_table.5.html">ldap</a>:fancy.cf $ postmap -q auser@example.com <a href="ldap_table.5.html">ldap</a>:/etc/postfix/fancy.cf \
auser@mailhub.example.com auser@mailhub.example.com
$ postmap -q cuser@example.com <a href="ldap_table.5.html">ldap</a>:fancy.cf $ postmap -q cuser@example.com <a href="ldap_table.5.html">ldap</a>:/etc/postfix/fancy.cf \
cuser@example.com cuser@example.com
$ postmap -q agroup@example.com <a href="ldap_table.5.html">ldap</a>:fancy.cf $ postmap -q agroup@example.com <a href="ldap_table.5.html">ldap</a>:/etc/postfix/fancy.cf \
auser@mailhub.example.com,buser@mailhub.example.com,auser@example.org,buser@example.org auser@mailhub.example.com,buser@mailhub.example.com,auser@example.org,buser@example.org
$ postmap -q bgroup@example.com <a href="ldap_table.5.html">ldap</a>:fancy.cf $ postmap -q bgroup@example.com <a href="ldap_table.5.html">ldap</a>:/etc/postfix/fancy.cf \
bgroup@mlm.example.com bgroup@mlm.example.com
</pre> </pre>
</blockquote> </blockquote>

7
postfix/html/QSHAPE_README.html
View File

@ -507,6 +507,7 @@ the same destination. </p>
/etc/postfix/<a href="postconf.5.html">main.cf</a>: /etc/postfix/<a href="postconf.5.html">main.cf</a>:
<a href="postconf.5.html#transport_maps">transport_maps</a> = hash:/etc/postfix/transport <a href="postconf.5.html#transport_maps">transport_maps</a> = hash:/etc/postfix/transport
slow_destination_rate_delay = 1 slow_destination_rate_delay = 1
slow_destination_concurrency_failed_cohort_limit = 100
/etc/postfix/transport: /etc/postfix/transport:
example.com slow: example.com slow:
@ -524,6 +525,12 @@ the same destination. </p>
$slow_destination_rate_delay seconds between deliveries to the same $slow_destination_rate_delay seconds between deliveries to the same
destination. </p> destination. </p>
<p> IMPORTANT!! The large slow_destination_concurrency_failed_cohort_limit
value is needed. This prevents Postfix from deferring all mail for
the same destination after only one connection or handshake error
(the reason for this is that non-zero slow_destination_rate_delay
forces a per-destination concurrency of 1). </p>
<li> <p> Earlier Postfix versions: </p> <li> <p> Earlier Postfix versions: </p>
<ul> <ul>

2
postfix/html/SQLITE_README.html
View File

@ -54,7 +54,7 @@ map type in <a href="postconf.5.html">main.cf</a> like this: </p>
<blockquote> <blockquote>
<pre> <pre>
<a href="postconf.5.html#alias_maps">alias_maps</a> = <a href="mysql_table.5.html">sqlite</a>:/etc/postfix/sqlite-aliases.cf <a href="postconf.5.html#alias_maps">alias_maps</a> = <a href="sqlite_table.5.html">sqlite</a>:/etc/postfix/sqlite-aliases.cf
</pre> </pre>
</blockquote> </blockquote>

9
postfix/html/postconf.5.html
View File

@ -1980,6 +1980,11 @@ transport-specific override, where <i>transport</i> is the <a href="master.5.htm
name of the message delivery transport. name of the message delivery transport.
</p> </p>
<p> NOTE: with a non-zero _destination_rate_delay, specify a
<a href="postconf.5.html#transport_destination_concurrency_failed_cohort_limit"><i>transport</i>_destination_concurrency_failed_cohort_limit</a> of 10
or more to prevent Postfix from deferring all mail for the same
destination after only one connection or handshake error. </p>
<p> This feature is available in Postfix 2.5 and later. </p> <p> This feature is available in Postfix 2.5 and later. </p>
@ -10880,8 +10885,8 @@ Example:
(default: $<a href="postconf.5.html#mynetworks">mynetworks</a>)</b></DT><DD> (default: $<a href="postconf.5.html#mynetworks">mynetworks</a>)</b></DT><DD>
<p> <p>
Clients that are excluded from connection count, connection rate, Clients that are excluded from smtpd_client_*_count/rate_limit
or SMTP request rate restrictions. See the <a href="postconf.5.html#mynetworks">mynetworks</a> parameter restrictions. See the <a href="postconf.5.html#mynetworks">mynetworks</a> parameter
description for the parameter value syntax. description for the parameter value syntax.
</p> </p>

8
postfix/html/sqlite_table.5.html
View File

@ -10,9 +10,9 @@ SQLITE_TABLE(5) SQLITE_TABLE(5)
sqlite_table - Postfix SQLite configuration sqlite_table - Postfix SQLite configuration
<b>SYNOPSIS</b> <b>SYNOPSIS</b>
<b>postmap -q "</b><i>string</i><b>" <a href="mysql_table.5.html">sqlite</a>:/etc/postfix/filename</b> <b>postmap -q "</b><i>string</i><b>" <a href="sqlite_table.5.html">sqlite</a>:/etc/postfix/filename</b>
<b>postmap -q - <a href="mysql_table.5.html">sqlite</a>:/etc/postfix/</b><i>filename</i> &lt;<i>inputfile</i> <b>postmap -q - <a href="sqlite_table.5.html">sqlite</a>:/etc/postfix/</b><i>filename</i> &lt;<i>inputfile</i>
<b>DESCRIPTION</b> <b>DESCRIPTION</b>
The Postfix mail system uses optional tables for address The Postfix mail system uses optional tables for address
@ -22,7 +22,7 @@ SQLITE_TABLE(5) SQLITE_TABLE(5)
Alternatively, lookup tables can be specified as SQLite Alternatively, lookup tables can be specified as SQLite
databases. In order to use SQLite lookups, define an databases. In order to use SQLite lookups, define an
SQLite source as a lookup table in <a href="postconf.5.html">main.cf</a>, for example: SQLite source as a lookup table in <a href="postconf.5.html">main.cf</a>, for example:
<a href="postconf.5.html#alias_maps">alias_maps</a> = <a href="mysql_table.5.html">sqlite</a>:/etc/sqlite-aliases.cf <a href="postconf.5.html#alias_maps">alias_maps</a> = <a href="sqlite_table.5.html">sqlite</a>:/etc/sqlite-aliases.cf
The file /etc/postfix/sqlite-aliases.cf has the same for- The file /etc/postfix/sqlite-aliases.cf has the same for-
mat as the Postfix <a href="postconf.5.html">main.cf</a> file, and can specify the mat as the Postfix <a href="postconf.5.html">main.cf</a> file, and can specify the
@ -35,7 +35,7 @@ SQLITE_TABLE(5) SQLITE_TABLE(5)
with a slash or a dot. The SQLite parameters will then be with a slash or a dot. The SQLite parameters will then be
accessible as the name you've given the source in its def- accessible as the name you've given the source in its def-
inition, an underscore, and the name of the parameter. inition, an underscore, and the name of the parameter.
For example, if the map is specified as "<a href="mysql_table.5.html">sqlite</a>:<i>sqlite-</i> For example, if the map is specified as "<a href="sqlite_table.5.html">sqlite</a>:<i>sqlite-</i>
<i>name</i>", the parameter "query" below would be defined in <i>name</i>", the parameter "query" below would be defined in
<a href="postconf.5.html">main.cf</a> as "<i>sqlitename</i>_query". <a href="postconf.5.html">main.cf</a> as "<i>sqlitename</i>_query".

9
postfix/man/man5/postconf.5
View File

@ -1150,6 +1150,11 @@ Use \fItransport\fR_destination_rate_delay to specify a
transport-specific override, where \fItransport\fR is the master.cf transport-specific override, where \fItransport\fR is the master.cf
name of the message delivery transport. name of the message delivery transport.
.PP .PP
NOTE: with a non-zero _destination_rate_delay, specify a
\fItransport\fR_destination_concurrency_failed_cohort_limit of 10
or more to prevent Postfix from deferring all mail for the same
destination after only one connection or handshake error.
.PP
This feature is available in Postfix 2.5 and later. This feature is available in Postfix 2.5 and later.
.SH default_destination_recipient_limit (default: 50) .SH default_destination_recipient_limit (default: 50)
The default maximal number of recipients per message delivery. The default maximal number of recipients per message delivery.
@ -6634,8 +6639,8 @@ smtpd_client_connection_rate_limit = 1000
.ad .ad
.ft R .ft R
.SH smtpd_client_event_limit_exceptions (default: $mynetworks) .SH smtpd_client_event_limit_exceptions (default: $mynetworks)
Clients that are excluded from connection count, connection rate, Clients that are excluded from smtpd_client_*_count/rate_limit
or SMTP request rate restrictions. See the mynetworks parameter restrictions. See the mynetworks parameter
description for the parameter value syntax. description for the parameter value syntax.
.PP .PP
By default, clients in trusted networks are excluded. Specify a By default, clients in trusted networks are excluded. Specify a

2
postfix/mantools/postlink
View File

@ -979,7 +979,7 @@ while (<>) {
s/\b(nisplus):/<a href="nisplus_table.5.html">$1<\/a>:/g; s/\b(nisplus):/<a href="nisplus_table.5.html">$1<\/a>:/g;
s/\b(ldap):/<a href="ldap_table.5.html">$1<\/a>:/g; s/\b(ldap):/<a href="ldap_table.5.html">$1<\/a>:/g;
s/\b(regexp):/<a href="regexp_table.5.html">$1<\/a>:/g; s/\b(regexp):/<a href="regexp_table.5.html">$1<\/a>:/g;
s/\b(sqlite):/<a href="mysql_table.5.html">$1<\/a>:/g; s/\b(sqlite):/<a href="sqlite_table.5.html">$1<\/a>:/g;
s/\b(tcp):/<a href="tcp_table.5.html">$1<\/a>:/g; s/\b(tcp):/<a href="tcp_table.5.html">$1<\/a>:/g;
# Do nice links for smtp:host:port etc. # Do nice links for smtp:host:port etc.

39
postfix/proto/LDAP_README.html
View File

@ -336,8 +336,8 @@ related settings (hosts, ports, bind settings, timeouts, ...) we have:
search_base = dc=example, dc=com search_base = dc=example, dc=com
query_filter = mail=%s query_filter = mail=%s
result_attribute = memberaddr result_attribute = memberaddr
$ postmap -q agroup@example.com ldap:simple.cf $ postmap -q agroup@example.com ldap:/etc/postfix/simple.cf \
auser@example.org,buser@example.org auser@example.org,buser@example.org
</pre> </pre>
</blockquote> </blockquote>
@ -369,8 +369,8 @@ assume for the moment that groups never have a "maildrop" (the "bgroup"
query_filter = mail=%s query_filter = mail=%s
result_attribute = maildrop result_attribute = maildrop
special_result_attribute = memberdn special_result_attribute = memberdn
$ postmap -q agroup@example.com ldap:special.cf $ postmap -q agroup@example.com ldap:/etc/postfix/special.cf \
auser@mailhub.example.com,buser@mailhub.example.com auser@mailhub.example.com,buser@mailhub.example.com
</pre> </pre>
</blockquote> </blockquote>
@ -400,12 +400,15 @@ never nested members of groups that are directly expanded. </p>
query_filter = mail=%s query_filter = mail=%s
result_attribute = maildrop result_attribute = maildrop
special_result_attribute = memberdn special_result_attribute = memberdn
$ postmap -q auser@example.com ldap:no_expand.cf ldap:expand.cf $ postmap -q auser@example.com \
auser@mailhub.example.com ldap:/etc/postfix/no_expand.cf ldap:/etc/postfix/expand.cf \
$ postmap -q agroup@example.com ldap:no_expand.cf ldap:expand.cf auser@mailhub.example.com
auser@mailhub.example.com,buser@mailhub.example.com $ postmap -q agroup@example.com \
$ postmap -q bgroup@example.com ldap:no_expand.cf ldap:expand.cf ldap:/etc/postfix/no_expand.cf ldap:/etc/postfix/expand.cf \
bgroup@mlm.example.com auser@mailhub.example.com,buser@mailhub.example.com
$ postmap -q bgroup@example.com \
ldap:/etc/postfix/no_expand.cf ldap:/etc/postfix/expand.cf \
bgroup@mlm.example.com
</pre> </pre>
</blockquote> </blockquote>
@ -429,14 +432,14 @@ expanded groups. </p>
special_result_attribute = memberdn special_result_attribute = memberdn
terminal_result_attribute = maildrop terminal_result_attribute = maildrop
leaf_result_attribute = mail leaf_result_attribute = mail
$ postmap -q auser@example.com ldap:fancy.cf $ postmap -q auser@example.com ldap:/etc/postfix/fancy.cf \
auser@mailhub.example.com auser@mailhub.example.com
$ postmap -q cuser@example.com ldap:fancy.cf $ postmap -q cuser@example.com ldap:/etc/postfix/fancy.cf \
cuser@example.com cuser@example.com
$ postmap -q agroup@example.com ldap:fancy.cf $ postmap -q agroup@example.com ldap:/etc/postfix/fancy.cf \
auser@mailhub.example.com,buser@mailhub.example.com,auser@example.org,buser@example.org auser@mailhub.example.com,buser@mailhub.example.com,auser@example.org,buser@example.org
$ postmap -q bgroup@example.com ldap:fancy.cf $ postmap -q bgroup@example.com ldap:/etc/postfix/fancy.cf \
bgroup@mlm.example.com bgroup@mlm.example.com
</pre> </pre>
</blockquote> </blockquote>

7
postfix/proto/QSHAPE_README.html
View File

@ -507,6 +507,7 @@ the same destination. </p>
/etc/postfix/main.cf: /etc/postfix/main.cf:
transport_maps = hash:/etc/postfix/transport transport_maps = hash:/etc/postfix/transport
slow_destination_rate_delay = 1 slow_destination_rate_delay = 1
slow_destination_concurrency_failed_cohort_limit = 100
/etc/postfix/transport: /etc/postfix/transport:
example.com slow: example.com slow:
@ -524,6 +525,12 @@ the same destination. </p>
$slow_destination_rate_delay seconds between deliveries to the same $slow_destination_rate_delay seconds between deliveries to the same
destination. </p> destination. </p>
<p> IMPORTANT!! The large slow_destination_concurrency_failed_cohort_limit
value is needed. This prevents Postfix from deferring all mail for
the same destination after only one connection or handshake error
(the reason for this is that non-zero slow_destination_rate_delay
forces a per-destination concurrency of 1). </p>
<li> <p> Earlier Postfix versions: </p> <li> <p> Earlier Postfix versions: </p>
<ul> <ul>

9
postfix/proto/postconf.proto
View File

@ -4592,8 +4592,8 @@ This feature is available in Postfix 2.2 and later.
%PARAM smtpd_client_event_limit_exceptions $mynetworks %PARAM smtpd_client_event_limit_exceptions $mynetworks
<p> <p>
Clients that are excluded from connection count, connection rate, Clients that are excluded from smtpd_client_*_count/rate_limit
or SMTP request rate restrictions. See the mynetworks parameter restrictions. See the mynetworks parameter
description for the parameter value syntax. description for the parameter value syntax.
</p> </p>
@ -12059,6 +12059,11 @@ transport-specific override, where <i>transport</i> is the master.cf
name of the message delivery transport. name of the message delivery transport.
</p> </p>
<p> NOTE: with a non-zero _destination_rate_delay, specify a
<i>transport</i>_destination_concurrency_failed_cohort_limit of 10
or more to prevent Postfix from deferring all mail for the same
destination after only one connection or handshake error. </p>
<p> This feature is available in Postfix 2.5 and later. </p> <p> This feature is available in Postfix 2.5 and later. </p>
%PARAM transport_destination_rate_delay $default_destination_rate_delay %PARAM transport_destination_rate_delay $default_destination_rate_delay

2
postfix/src/global/mail_version.h
View File

@ -20,7 +20,7 @@
* Patches change both the patchlevel and the release date. Snapshots have no * Patches change both the patchlevel and the release date. Snapshots have no
* patchlevel; they change the release date only. * patchlevel; they change the release date only.
*/ */
#define MAIL_RELEASE_DATE "20100618" #define MAIL_RELEASE_DATE "20100707"
#define MAIL_VERSION_NUMBER "2.8" #define MAIL_VERSION_NUMBER "2.8"
#ifdef SNAPSHOT #ifdef SNAPSHOT

3
postfix/src/oqmgr/qmgr_message.c
View File

@ -724,6 +724,9 @@ static int qmgr_message_read(QMGR_MESSAGE *message)
msg_warn("%s: ignoring bad VERP request: \"%.100s\"", msg_warn("%s: ignoring bad VERP request: \"%.100s\"",
message->queue_id, start); message->queue_id, start);
} else { } else {
if (msg_verbose)
msg_info("%s: enabling VERP for sender \"%.100s\"",
message->queue_id, message->sender);
message->single_rcpt = 1; message->single_rcpt = 1;
message->verp_delims = mystrdup(start); message->verp_delims = mystrdup(start);
} }

3
postfix/src/qmgr/qmgr_message.c
View File

@ -765,6 +765,9 @@ static int qmgr_message_read(QMGR_MESSAGE *message)
msg_warn("%s: ignoring bad VERP request: \"%.100s\"", msg_warn("%s: ignoring bad VERP request: \"%.100s\"",
message->queue_id, start); message->queue_id, start);
} else { } else {
if (msg_verbose)
msg_info("%s: enabling VERP for sender \"%.100s\"",
message->queue_id, message->sender);
message->single_rcpt = 1; message->single_rcpt = 1;
message->verp_delims = mystrdup(start); message->verp_delims = mystrdup(start);
} }

1
postfix/src/tls/tls_misc.c
View File

@ -421,6 +421,7 @@ void tls_param_init(void)
get_mail_conf_str_table(str_table); get_mail_conf_str_table(str_table);
get_mail_conf_int_table(int_table); get_mail_conf_int_table(int_table);
get_mail_conf_bool_table(bool_table);
} }
/* tls_set_ciphers - Set SSL context cipher list */ /* tls_set_ciphers - Set SSL context cipher list */