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

postfix-2.7-20100117

Browse Source
This commit is contained in:
Wietse Venema 2010-01-17 00:00:00 -05:00 committed by Viktor Dukhovni
parent f06480fb17
commit cee08cce6c
36 changed files with 628 additions and 585 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
postfix/HISTORY
View File

@ -15648,21 +15648,30 @@ Apologies for any names omitted.
Cleanup: don't supply the "-o stress" command-line option
with a single-process service. File: master/master_ent.c.
20100116
20100115
Bugfix: the valid_hostname() fuction did not set the
"non-numeric" flag after encountering the '-' character.
Reported by Jan Schampera. File: util/valid_hostname.c.
Cleanup: when a content_filter parameter or FILTER command
specifies an empty next-hop destination, the queue manager
now uses the recipient domain instead of $myhostname. Specify
"legacy_filter_nexthop = yes" for backwards compatibility
with Postfix 2.6 and earlier, or specify a non-empty next-hop
destination. Files: *qmgr/qmgr_message.c proto/access,
proto/header_checks, proto/postconf.proto, proto/FILTER_README.
20100116
Documentation: the content_filter and FILTER features never
supported the special cases of transport_maps. References
to transport_maps syntax are now removed from content filter
discussions. Files: proto/postconf.proto, proto/FILTER_README.
Workaround: as of Postfix 2.3 the VRFY command did not allow
a mailbox address inside <>, which broke expectations. RFC
2821 (and 5321) is vague about the VRFY request format, but
spends lots of text on the reply format. File: smtpd/smtpd.c.
20010117
Cleanup: when a content_filter parameter or FILTER command
specifies an empty next-hop destination, the queue manager
now uses the recipient domain instead of $myhostname. Specify
"default_filter_nexthop = $myhostname" for compatibility
with Postfix 2.6 and earlier, or specify a non-empty next-hop
filter destination. Files: *qmgr/qmgr_message.c proto/access,
proto/header_checks, proto/postconf.proto, proto/FILTER_README.

38
postfix/README_FILES/FILTER_README
View File

@ -221,17 +221,18 @@ Once you're satisfied with the content filtering script:
The content_filter configuration parameter expects a value of the form
transport:destination. The transport name specifies the first field of a
mail delivery agent definition in master.cf; the syntax of destination is
described in the manual page of the corresponding delivery agent.
mail delivery agent definition in master.cf; the syntax of the next-hop
destination is described in the manual page of the corresponding delivery
agent.
The meaning of an empty filter destination is version dependent. Postfix
2.7 and later will use the recipient domain; earlier versions will use
$myhostname. Specify "legacy_filter_nexthop = yes" for compatibility with
Postfix 2.6 or earlier, or specify a non-empty filter destination.
The meaning of an empty next-hop filter destination is version dependent.
Postfix 2.7 and later will use the recipient domain; earlier versions will
use $myhostname. Specify "default_filter_nexthop = $myhostname" for
compatibility with Postfix 2.6 or earlier, or specify a non-empty next-hop
filter destination.
The content_filter setting has a lower precedence than a content filter
that is specified with an access(5) table or in a header_checks(5) or
body_checks(5) table.
The content_filter setting has lower precedence than a FILTER action that
is specified in an access(5), header_checks(5) or body_checks(5) table.
* Execute "ppoossttffiixx rreellooaadd" to complete the change.
@ -340,17 +341,18 @@ To enable the advanced content filter method for all mail, specify in main.cf:
* The content_filter configuration parameter expects a value of the form
transport:destination. The transport name specifies the first field of a
mail delivery agent definition in master.cf; the syntax of destination is
described in the manual page of the corresponding delivery agent.
mail delivery agent definition in master.cf; the syntax of the next-hop
destination is described in the manual page of the corresponding delivery
agent.
* The meaning of an empty filter destination is version dependent. Postfix
2.7 and later will use the recipient domain; earlier versions will use
$myhostname. Specify "legacy_filter_nexthop = yes" for compatibility with
Postfix 2.6 or earlier, or specify a non-empty filter destination.
* The meaning of an empty next-hop filter destination is version dependent.
Postfix 2.7 and later will use the recipient domain; earlier versions will
use $myhostname. Specify "default_filter_nexthop = $myhostname" for
compatibility with Postfix 2.6 or earlier, or specify a non-empty next-hop
filter destination.
* The content_filter setting has a lower precedence than a content filter
that is specified with an access(5) table or in a header_checks(5) or
body_checks(5) table.
* The content_filter setting has lower precedence than a FILTER action that
is specified in an access(5), header_checks(5) or body_checks(5) table.
AAddvvaanncceedd ccoonntteenntt ffiilltteerr:: sseennddiinngg uunnffiilltteerreedd mmaaiill ttoo tthhee ccoonntteenntt ffiilltteerr

22
postfix/RELEASE_NOTES
View File

@ -14,23 +14,27 @@ specifies the release date of a stable release or snapshot release.
If you upgrade from Postfix 2.5 or earlier, read RELEASE_NOTES-2.6
before proceeding.
Incompatibility with snapshot 20100116
Incompatibility with snapshot 20100117
======================================
The meaning of an empty content filter next-hop destination has
changed. Postfix now uses the recipient domain, instead of using
$myhostname as in Postfix 2.6 and earlier. To get the old behavior
use "legacy_filter_nexthop = yes", or specify a non-empty next-hop
filter destination.
use "default_filter_nexthop = $myhostname", or specify a non-empty
next-hop content filter destination.
Major changes with snapshot 20100116
Major changes with snapshot 20100117
====================================
The FILTER command can now be used to implement sender reputation
schemes that dynamically choose the SMTP source IP address. This
is implemented by specifying a FILTER with an empty next-hop
destination, and by configuring SMTP transports in master.cf with
appropriate "-o myhostname" and "-o smtp_bind_address" settings.
The FILTER action in access maps or header/body_checks now supports
sender reputation schemes that dynamically choose the SMTP source
IP address.
This is implemented by specifying FILTER actions with empty next-hop
destinations in access maps or header/body_checks, and by configuring
in master.cf one Postfix SMTP client for each SMTP source IP address,
where each client has its own "-o myhostname" and "-o smtp_bind_address"
settings.
Incompatibility with snapshot 20100101
======================================

23
postfix/conf/access
View File

@ -282,10 +282,10 @@
# sage through the specified external content filter.
# The transport name specifies the first field of a
# mail delivery agent definition in master.cf; the
# syntax of destination is described in the manual
# page of the corresponding delivery agent. More
# information about external content filters is in
# the Postfix FILTER_README file.
# syntax of the next-hop destination is described in
# the manual page of the corresponding delivery
# agent. More information about external content
# filters is in the Postfix FILTER_README file.
#
# Note 1: do not use $number regular expression sub-
# stitutions for transport or destination unless you
@ -298,13 +298,14 @@
#
# Note 3: the purpose of the FILTER command is to
# override message routing. To override the recipi-
# ent's transport but not destination, specify an
# empty destination (Postfix 2.7 and later), or spec-
# ify a transport:destination that delivers through a
# different Postfix instance (Postfix 2.6 and ear-
# lier). Other options are using the recipient-depen-
# dent transport_maps or the sender-dependent sender-
# _dependent_default_transport_maps features.
# ent's transport but not the next-hop destination,
# specify an empty filter destination (Postfix 2.7
# and later), or specify a transport:destination that
# delivers through a different Postfix instance
# (Postfix 2.6 and earlier). Other options are using
# the recipient-dependent transport_maps or the sen-
# der-dependent sender_dependent_default_transport-
# _maps features.
#
# This feature is available in Postfix 2.0 and later.
#

25
postfix/conf/header_checks
View File

@ -170,11 +170,11 @@
# After the message is queued, send the entire mes-
# sage through the specified external content filter.
# The transport name specifies the first field of a
# mail delivery agent definition master.cf; the syn-
# tax of destination is described in the manual page
# of the corresponding delivery agent. More informa-
# tion about external content filters is in the Post-
# fix FILTER_README file.
# mail delivery agent definition in master.cf; the
# syntax of the next-hop destination is described in
# the manual page of the corresponding delivery
# agent. More information about external content
# filters is in the Postfix FILTER_README file.
#
# Note 1: do not use $number regular expression sub-
# stitutions for transport or destination unless you
@ -187,13 +187,14 @@
#
# Note 3: the purpose of the FILTER command is to
# override message routing. To override the recipi-
# ent's transport but not destination, specify an
# empty destination (Postfix 2.7 and later), or spec-
# ify a transport:destination that delivers through a
# different Postfix instance (Postfix 2.6 and ear-
# lier). Other options are using the recipient-depen-
# dent transport_maps or the sender-dependent sender-
# _dependent_default_transport_maps features.
# ent's transport but not the next-hop destination,
# specify an empty filter destination (Postfix 2.7
# and later), or specify a transport:destination that
# delivers through a different Postfix instance
# (Postfix 2.6 and earlier). Other options are using
# the recipient-dependent transport_maps or the sen-
# der-dependent sender_dependent_default_transport-
# _maps features.
#
# This feature is available in Postfix 2.0 and later.
#

41
postfix/html/FILTER_README.html
View File

@ -399,18 +399,19 @@ and causes mail to be given to the content filter instead. </p>
<p> The <a href="postconf.5.html#content_filter">content_filter</a> configuration parameter expects a value of
the form <i>transport:destination</i>. The <i>transport</i> name
specifies the first field of a mail delivery agent definition in
<a href="master.5.html">master.cf</a>; the syntax of <i>destination</i> is described in the
manual page of the corresponding delivery agent. </p>
<a href="master.5.html">master.cf</a>; the syntax of the next-hop <i>destination</i> is described
in the manual page of the corresponding delivery agent. </p>
<p> The meaning of an empty filter <i>destination</i> is version
dependent. Postfix 2.7 and later will use the recipient domain;
earlier versions will use $<a href="postconf.5.html#myhostname">myhostname</a>. Specify "<a href="postconf.5.html#legacy_filter_nexthop">legacy_filter_nexthop</a>
= yes" for compatibility with Postfix 2.6 or earlier, or specify a
non-empty filter destination. </p>
<p> The meaning of an empty next-hop filter <i>destination</i> is
version dependent. Postfix 2.7 and later will use the recipient
domain; earlier versions will use $<a href="postconf.5.html#myhostname">myhostname</a>. Specify
"<a href="postconf.5.html#default_filter_nexthop">default_filter_nexthop</a> = $<a href="postconf.5.html#myhostname">myhostname</a>" for compatibility with Postfix
2.6 or earlier, or specify a non-empty next-hop filter <i>destination</i>.
</p>
<p> The <a href="postconf.5.html#content_filter">content_filter</a> setting has a lower precedence than a content
filter that is specified with an <a href="access.5.html">access(5)</a> table or in a <a href="header_checks.5.html">header_checks(5)</a>
or <a href="header_checks.5.html">body_checks(5)</a> table. </p>
<p> The <a href="postconf.5.html#content_filter">content_filter</a> setting has lower precedence than a FILTER
action that is specified in an <a href="access.5.html">access(5)</a>, <a href="header_checks.5.html">header_checks(5)</a> or
<a href="header_checks.5.html">body_checks(5)</a> table. </p>
<li> <p> Execute "<b>postfix reload</b>" to complete the change.
</p>
@ -625,18 +626,18 @@ of its final destination. </p>
<li> <p> The <a href="postconf.5.html#content_filter">content_filter</a> configuration parameter expects a value
of the form <i>transport:destination</i>. The <i>transport</i> name
specifies the first field of a mail delivery agent definition in
<a href="master.5.html">master.cf</a>; the syntax of <i>destination</i> is described in the
manual page of the corresponding delivery agent. </p>
<a href="master.5.html">master.cf</a>; the syntax of the next-hop <i>destination</i> is described
in the manual page of the corresponding delivery agent. </p>
<li> <p> The meaning of an empty filter <i>destination</i> is version
dependent. Postfix 2.7 and later will use the recipient domain;
earlier versions will use $<a href="postconf.5.html#myhostname">myhostname</a>. Specify "<a href="postconf.5.html#legacy_filter_nexthop">legacy_filter_nexthop</a>
= yes" for compatibility with Postfix 2.6 or earlier, or specify a
non-empty filter destination. </p>
<li> <p> The meaning of an empty next-hop filter <i>destination</i>
is version dependent. Postfix 2.7 and later will use the recipient
domain; earlier versions will use $<a href="postconf.5.html#myhostname">myhostname</a>. Specify
"<a href="postconf.5.html#default_filter_nexthop">default_filter_nexthop</a> = $<a href="postconf.5.html#myhostname">myhostname</a>" for compatibility with Postfix
2.6 or earlier, or specify a non-empty next-hop filter <i>destination</i>.
<li> <p> The <a href="postconf.5.html#content_filter">content_filter</a> setting has a lower precedence than a
content filter that is specified with an <a href="access.5.html">access(5)</a> table or in a
<a href="header_checks.5.html">header_checks(5)</a> or <a href="header_checks.5.html">body_checks(5)</a> table. </p>
<li> <p> The <a href="postconf.5.html#content_filter">content_filter</a> setting has lower precedence than a
FILTER action that is specified in an <a href="access.5.html">access(5)</a>, <a href="header_checks.5.html">header_checks(5)</a>
or <a href="header_checks.5.html">body_checks(5)</a> table. </p>
</ul>

23
postfix/html/access.5.html
View File

@ -288,10 +288,10 @@ ACCESS(5) ACCESS(5)
sage through the specified external content filter.
The <i>transport</i> name specifies the first field of a
mail delivery agent definition in <a href="master.5.html">master.cf</a>; the
syntax of <i>destination</i> is described in the manual
page of the corresponding delivery agent. More
information about external content filters is in
the Postfix <a href="FILTER_README.html">FILTER_README</a> file.
syntax of the next-hop <i>destination</i> is described in
the manual page of the corresponding delivery
agent. More information about external content
filters is in the Postfix <a href="FILTER_README.html">FILTER_README</a> file.
Note 1: do not use $<i>number</i> regular expression sub-
stitutions for <i>transport</i> or <i>destination</i> unless you
@ -304,13 +304,14 @@ ACCESS(5) ACCESS(5)
Note 3: the purpose of the FILTER command is to
override message routing. To override the recipi-
ent's <i>transport</i> but not <i>destination</i>, specify an
empty <i>destination</i> (Postfix 2.7 and later), or spec-
ify a <i>transport:destination</i> that delivers through a
different Postfix instance (Postfix 2.6 and ear-
lier). Other options are using the recipient-depen-
dent <b><a href="postconf.5.html#transport_maps">transport_maps</a></b> or the sender-dependent <b><a href="postconf.5.html#sender_dependent_default_transport_maps">sender</a>-</b>
<b><a href="postconf.5.html#sender_dependent_default_transport_maps">_dependent_default_transport_maps</a></b> features.
ent's <i>transport</i> but not the next-hop <i>destination</i>,
specify an empty filter <i>destination</i> (Postfix 2.7
and later), or specify a <i>transport:destination</i> that
delivers through a different Postfix instance
(Postfix 2.6 and earlier). Other options are using
the recipient-dependent <b><a href="postconf.5.html#transport_maps">transport_maps</a></b> or the sen-
der-dependent <b><a href="postconf.5.html#sender_dependent_default_transport_maps">sender_dependent_default_transport</a>-</b>
<b><a href="postconf.5.html#sender_dependent_default_transport_maps">_maps</a></b> features.
This feature is available in Postfix 2.0 and later.

25
postfix/html/header_checks.5.html
View File

@ -176,11 +176,11 @@ HEADER_CHECKS(5) HEADER_CHECKS(5)
After the message is queued, send the entire mes-
sage through the specified external content filter.
The <i>transport</i> name specifies the first field of a
mail delivery agent definition <a href="master.5.html">master.cf</a>; the syn-
tax of <i>destination</i> is described in the manual page
of the corresponding delivery agent. More informa-
tion about external content filters is in the Post-
fix <a href="FILTER_README.html">FILTER_README</a> file.
mail delivery agent definition in <a href="master.5.html">master.cf</a>; the
syntax of the next-hop <i>destination</i> is described in
the manual page of the corresponding delivery
agent. More information about external content
filters is in the Postfix <a href="FILTER_README.html">FILTER_README</a> file.
Note 1: do not use $<i>number</i> regular expression sub-
stitutions for <i>transport</i> or <i>destination</i> unless you
@ -193,13 +193,14 @@ HEADER_CHECKS(5) HEADER_CHECKS(5)
Note 3: the purpose of the FILTER command is to
override message routing. To override the recipi-
ent's <i>transport</i> but not <i>destination</i>, specify an
empty <i>destination</i> (Postfix 2.7 and later), or spec-
ify a <i>transport:destination</i> that delivers through a
different Postfix instance (Postfix 2.6 and ear-
lier). Other options are using the recipient-depen-
dent <b><a href="postconf.5.html#transport_maps">transport_maps</a></b> or the sender-dependent <b><a href="postconf.5.html#sender_dependent_default_transport_maps">sender</a>-</b>
<b><a href="postconf.5.html#sender_dependent_default_transport_maps">_dependent_default_transport_maps</a></b> features.
ent's <i>transport</i> but not the next-hop <i>destination</i>,
specify an empty filter <i>destination</i> (Postfix 2.7
and later), or specify a <i>transport:destination</i> that
delivers through a different Postfix instance
(Postfix 2.6 and earlier). Other options are using
the recipient-dependent <b><a href="postconf.5.html#transport_maps">transport_maps</a></b> or the sen-
der-dependent <b><a href="postconf.5.html#sender_dependent_default_transport_maps">sender_dependent_default_transport</a>-</b>
<b><a href="postconf.5.html#sender_dependent_default_transport_maps">_maps</a></b> features.
This feature is available in Postfix 2.0 and later.

9
postfix/html/oqmgr.8.html
View File

@ -195,10 +195,11 @@ OQMGR(8) OQMGR(8)
Available with Postfix version 2.7 and later:
<b><a href="postconf.5.html#legacy_filter_nexthop">legacy_filter_nexthop</a> (no)</b>
When a FILTER command does not specify a destina-
tion, force the destination to be $<a href="postconf.5.html#myhostname">myhostname</a>,
instead of using the recipient domain.
<b><a href="postconf.5.html#default_filter_nexthop">default_filter_nexthop</a> (empty)</b>
When a <a href="postconf.5.html#content_filter">content_filter</a> or FILTER request specifies
no explicit next-hop destination, use $default_fil-
ter_nexthop instead; when that value is empty, use
the domain in the recipient address.
<b>ACTIVE QUEUE CONTROLS</b>
<b><a href="postconf.5.html#qmgr_clog_warn_time">qmgr_clog_warn_time</a> (300s)</b>

4
postfix/html/pickup.8.html
View File

@ -53,8 +53,8 @@ PICKUP(8) PICKUP(8)
<b>CONTENT INSPECTION CONTROLS</b>
<b><a href="postconf.5.html#content_filter">content_filter</a> (empty)</b>
The name of a mail delivery transport that filters
mail after it is queued.
After the message is queued, send the entire mes-
sage to the specified <i>transport:destination</i>.
<b><a href="postconf.5.html#receive_override_options">receive_override_options</a> (empty)</b>
Enable or disable recipient validation, built-in

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

@ -1540,24 +1540,25 @@ is already bounded by $<a href="postconf.5.html#max_idle">max_idle</a>. </p>
<p> After the message is queued, send the entire message to the
specified <i>transport:destination</i>. The <i>transport</i> name
specifies the first field of a mail delivery agent definition in
<a href="master.5.html">master.cf</a>; the syntax of <i>destination</i> is described in the
manual page of the corresponding delivery agent. More information
about external content filters is in the Postfix <a href="FILTER_README.html">FILTER_README</a> file.
</p>
<a href="master.5.html">master.cf</a>; the syntax of the next-hop <i>destination</i> is described
in the manual page of the corresponding delivery agent. More
information about external content filters is in the Postfix
<a href="FILTER_README.html">FILTER_README</a> file. </p>
<p> Notes: </p>
<ul>
<li> <p> This setting has a lower precedence than a content filter that
is specified with an <a href="access.5.html">access(5)</a> table or in a <a href="header_checks.5.html">header_checks(5)</a> or
<a href="header_checks.5.html">body_checks(5)</a> table. </p>
<li> <p> This setting has lower precedence than a FILTER action
that is specified in an <a href="access.5.html">access(5)</a>, <a href="header_checks.5.html">header_checks(5)</a> or <a href="header_checks.5.html">body_checks(5)</a>
table. </p>
<li> <p> The meaning of an empty filter <i>destination</i> is version
dependent. Postfix 2.7 and later will use the recipient domain;
earlier versions will use $<a href="postconf.5.html#myhostname">myhostname</a>. Specify "<a href="postconf.5.html#legacy_filter_nexthop">legacy_filter_nexthop</a>
= yes" for compatibility with Postfix 2.6 or earlier, or specify
a non-empty filter <i>destination</i>. </p>
<li> <p> The meaning of an empty next-hop filter <i>destination</i>
is version dependent. Postfix 2.7 and later will use the recipient
domain; earlier versions will use $<a href="postconf.5.html#myhostname">myhostname</a>. Specify
"<a href="postconf.5.html#default_filter_nexthop">default_filter_nexthop</a> = $<a href="postconf.5.html#myhostname">myhostname</a>" for compatibility with Postfix
2.6 or earlier, or specify a <a href="postconf.5.html#content_filter">content_filter</a> value with an explicit
next-hop <i>destination</i>. </p>
</ul>
@ -2021,6 +2022,21 @@ name of the message delivery transport.
</p>
</DD>
<DT><b><a name="default_filter_nexthop">default_filter_nexthop</a>
(default: empty)</b></DT><DD>
<p> When a <a href="postconf.5.html#content_filter">content_filter</a> or FILTER request specifies no explicit
next-hop destination, use $<a href="postconf.5.html#default_filter_nexthop">default_filter_nexthop</a> instead; when
that value is empty, use the domain in the recipient address.
Specify "<a href="postconf.5.html#default_filter_nexthop">default_filter_nexthop</a> = $<a href="postconf.5.html#myhostname">myhostname</a>" for compatibility
with Postfix version 2.6 and earlier, or specify an explicit next-hop
destination with each <a href="postconf.5.html#content_filter">content_filter</a> value or FILTER action. </p>
<p> This feature is available in Postfix 2.7 and later. </p>
</DD>
<DT><b><a name="default_minimum_delivery_slots">default_minimum_delivery_slots</a>
@ -3502,20 +3518,6 @@ This feature is available in Postfix 2.1 and later.
</p>
</DD>
<DT><b><a name="legacy_filter_nexthop">legacy_filter_nexthop</a>
(default: no)</b></DT><DD>
<p> When a FILTER command does not specify a destination, force the
destination to be $<a href="postconf.5.html#myhostname">myhostname</a>, instead of using the recipient domain.
Specify "<a href="postconf.5.html#legacy_filter_nexthop">legacy_filter_nexthop</a> = yes" for compatibility with Postfix
version 2.6 and earlier, or specify a non-empty filter destination.
</p>
<p> This feature is available in Postfix 2.7 and later. </p>
</DD>
<DT><b><a name="line_length_limit">line_length_limit</a>

9
postfix/html/qmgr.8.html
View File

@ -201,10 +201,11 @@ QMGR(8) QMGR(8)
Available with Postfix version 2.7 and later:
<b><a href="postconf.5.html#legacy_filter_nexthop">legacy_filter_nexthop</a> (no)</b>
When a FILTER command does not specify a destina-
tion, force the destination to be $<a href="postconf.5.html#myhostname">myhostname</a>,
instead of using the recipient domain.
<b><a href="postconf.5.html#default_filter_nexthop">default_filter_nexthop</a> (empty)</b>
When a <a href="postconf.5.html#content_filter">content_filter</a> or FILTER request specifies
no explicit next-hop destination, use $default_fil-
ter_nexthop instead; when that value is empty, use
the domain in the recipient address.
<b>ACTIVE QUEUE CONTROLS</b>
<b><a href="postconf.5.html#qmgr_clog_warn_time">qmgr_clog_warn_time</a> (300s)</b>

4
postfix/html/qmqpd.8.html
View File

@ -52,8 +52,8 @@ QMQPD(8) QMQPD(8)
<b>CONTENT INSPECTION CONTROLS</b>
<b><a href="postconf.5.html#content_filter">content_filter</a> (empty)</b>
The name of a mail delivery transport that filters
mail after it is queued.
After the message is queued, send the entire mes-
sage to the specified <i>transport:destination</i>.
<b><a href="postconf.5.html#receive_override_options">receive_override_options</a> (empty)</b>
Enable or disable recipient validation, built-in

4
postfix/html/smtpd.8.html
View File

@ -178,8 +178,8 @@ SMTPD(8) SMTPD(8)
See the <a href="FILTER_README.html">FILTER_README</a> document for details.
<b><a href="postconf.5.html#content_filter">content_filter</a> (empty)</b>
The name of a mail delivery transport that filters
mail after it is queued.
After the message is queued, send the entire mes-
sage to the specified <i>transport:destination</i>.
<b>BEFORE QUEUE EXTERNAL CONTENT INSPECTION CONTROLS</b>
As of version 2.1, the Postfix SMTP server can be config-

22
postfix/man/man5/access.5
View File

@ -269,10 +269,11 @@ This feature is available in Postfix 2.0 and later.
After the message is queued, send the entire message through
the specified external content filter. The \fItransport\fR
name specifies the first field of a mail delivery agent
definition in master.cf; the syntax of \fIdestination\fR
is described in the manual page of the corresponding delivery
agent. More information about external content filters is
in the Postfix FILTER_README file.
definition in master.cf; the syntax of the next-hop
\fIdestination\fR is described in the manual page of the
corresponding delivery agent. More information about
external content filters is in the Postfix FILTER_README
file.
.sp
Note 1: do not use $\fInumber\fR regular expression
substitutions for \fItransport\fR or \fIdestination\fR
@ -285,12 +286,13 @@ one is executed.
.sp
Note 3: the purpose of the FILTER command is to override
message routing. To override the recipient's \fItransport\fR
but not \fIdestination\fR, specify an empty \fIdestination\fR
(Postfix 2.7 and later), or specify a \fItransport:destination\fR
that delivers through a different Postfix instance (Postfix
2.6 and earlier). Other options are using the recipient-dependent
\fBtrans\%port\%_maps\fR or the sen\%der-dependent
\fBsender\%_de\%pen\%dent_default_trans\%port\%_maps\fR
but not the next-hop \fIdestination\fR, specify an empty
filter \fIdestination\fR (Postfix 2.7 and later), or specify
a \fItransport:destination\fR that delivers through a
different Postfix instance (Postfix 2.6 and earlier). Other
options are using the recipient-dependent \fBtrans\%port\%_maps\fR
or the sen\%der-dependent
\fBsender\%_de\%pen\%dent\%_de\%fault\%_trans\%port\%_maps\fR
features.
.sp
This feature is available in Postfix 2.0 and later.

22
postfix/man/man5/header_checks.5
View File

@ -171,10 +171,11 @@ This feature is available in Postfix 2.1 and later.
After the message is queued, send the entire message through
the specified external content filter. The \fItransport\fR
name specifies the first field of a mail delivery agent
definition master.cf; the syntax of \fIdestination\fR is
described in the manual page of the corresponding delivery
agent. More information about external content filters is
in the Postfix FILTER_README file.
definition in master.cf; the syntax of the next-hop
\fIdestination\fR is described in the manual page of the
corresponding delivery agent. More information about
external content filters is in the Postfix FILTER_README
file.
.sp
Note 1: do not use $\fInumber\fR regular expression
substitutions for \fItransport\fR or \fIdestination\fR
@ -187,12 +188,13 @@ one is executed.
.sp
Note 3: the purpose of the FILTER command is to override
message routing. To override the recipient's \fItransport\fR
but not \fIdestination\fR, specify an empty \fIdestination\fR
(Postfix 2.7 and later), or specify a \fItransport:destination\fR
that delivers through a different Postfix instance (Postfix
2.6 and earlier). Other options are using the recipient-dependent
\fBtrans\%port\%_maps\fR or the sen\%der-dependent
\fBsender\%_de\%pen\%dent_default_trans\%port\%_maps\fR
but not the next-hop \fIdestination\fR, specify an empty
filter \fIdestination\fR (Postfix 2.7 and later), or specify
a \fItransport:destination\fR that delivers through a
different Postfix instance (Postfix 2.6 and earlier). Other
options are using the recipient-dependent \fBtrans\%port\%_maps\fR
or the sen\%der-dependent
\fBsender\%_de\%pen\%dent\%_de\%fault\%_trans\%port\%_maps\fR
features.
.sp
This feature is available in Postfix 2.0 and later.

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

@ -853,21 +853,23 @@ is already bounded by $max_idle.
After the message is queued, send the entire message to the
specified \fItransport:destination\fR. The \fItransport\fR name
specifies the first field of a mail delivery agent definition in
master.cf; the syntax of \fIdestination\fR is described in the
manual page of the corresponding delivery agent. More information
about external content filters is in the Postfix FILTER_README file.
master.cf; the syntax of the next-hop \fIdestination\fR is described
in the manual page of the corresponding delivery agent. More
information about external content filters is in the Postfix
FILTER_README file.
.PP
Notes:
.IP \(bu
This setting has a lower precedence than a content filter that
is specified with an \fBaccess\fR(5) table or in a \fBheader_checks\fR(5) or
\fBbody_checks\fR(5) table.
This setting has lower precedence than a FILTER action
that is specified in an \fBaccess\fR(5), \fBheader_checks\fR(5) or \fBbody_checks\fR(5)
table.
.IP \(bu
The meaning of an empty filter \fIdestination\fR is version
dependent. Postfix 2.7 and later will use the recipient domain;
earlier versions will use $myhostname. Specify "legacy_filter_nexthop
= yes" for compatibility with Postfix 2.6 or earlier, or specify
a non-empty filter \fIdestination\fR.
The meaning of an empty next-hop filter \fIdestination\fR
is version dependent. Postfix 2.7 and later will use the recipient
domain; earlier versions will use $myhostname. Specify
"default_filter_nexthop = $myhostname" for compatibility with Postfix
2.6 or earlier, or specify a content_filter value with an explicit
next-hop \fIdestination\fR.
.SH cyrus_sasl_config_path (default: empty)
Search path for Cyrus SASL application configuration files,
currently used only to locate the $smtpd_sasl_path.conf file.
@ -1168,6 +1170,15 @@ degradation.
Use \fItransport\fR_extra_recipient_limit to specify a
transport-specific override, where \fItransport\fR is the master.cf
name of the message delivery transport.
.SH default_filter_nexthop (default: empty)
When a content_filter or FILTER request specifies no explicit
next-hop destination, use $default_filter_nexthop instead; when
that value is empty, use the domain in the recipient address.
Specify "default_filter_nexthop = $myhostname" for compatibility
with Postfix version 2.6 and earlier, or specify an explicit next-hop
destination with each content_filter value or FILTER action.
.PP
This feature is available in Postfix 2.7 and later.
.SH default_minimum_delivery_slots (default: 3)
How many recipients a message must have in order to invoke the
Postfix queue manager's scheduling algorithm at all. Messages
@ -1956,13 +1967,6 @@ Time units: s (seconds), m (minutes), h (hours), d (days), w (weeks).
The default time unit is s (seconds).
.PP
This feature is available in Postfix 2.1 and later.
.SH legacy_filter_nexthop (default: no)
When a FILTER command does not specify a destination, force the
destination to be $myhostname, instead of using the recipient domain.
Specify "legacy_filter_nexthop = yes" for compatibility with Postfix
version 2.6 and earlier, or specify a non-empty filter destination.
.PP
This feature is available in Postfix 2.7 and later.
.SH line_length_limit (default: 2048)
Upon input, long lines are chopped up into pieces of at most
this length; upon delivery, long lines are reconstructed.

7
postfix/man/man8/oqmgr.8
View File

@ -185,9 +185,10 @@ Allow a sender or recipient address to have `-' as the first
character.
.PP
Available with Postfix version 2.7 and later:
.IP "\fBlegacy_filter_nexthop (no)\fR"
When a FILTER command does not specify a destination, force the
destination to be $myhostname, instead of using the recipient domain.
.IP "\fBdefault_filter_nexthop (empty)\fR"
When a content_filter or FILTER request specifies no explicit
next-hop destination, use $default_filter_nexthop instead; when
that value is empty, use the domain in the recipient address.
.SH "ACTIVE QUEUE CONTROLS"
.na
.nf

4
postfix/man/man8/pickup.8
View File

@ -64,8 +64,8 @@ The text below provides only a parameter summary. See
.ad
.fi
.IP "\fBcontent_filter (empty)\fR"
The name of a mail delivery transport that filters mail after
it is queued.
After the message is queued, send the entire message to the
specified \fItransport:destination\fR.
.IP "\fBreceive_override_options (empty)\fR"
Enable or disable recipient validation, built-in content
filtering, or address mapping.

7
postfix/man/man8/qmgr.8
View File

@ -189,9 +189,10 @@ Allow a sender or recipient address to have `-' as the first
character.
.PP
Available with Postfix version 2.7 and later:
.IP "\fBlegacy_filter_nexthop (no)\fR"
When a FILTER command does not specify a destination, force the
destination to be $myhostname, instead of using the recipient domain.
.IP "\fBdefault_filter_nexthop (empty)\fR"
When a content_filter or FILTER request specifies no explicit
next-hop destination, use $default_filter_nexthop instead; when
that value is empty, use the domain in the recipient address.
.SH "ACTIVE QUEUE CONTROLS"
.na
.nf

4
postfix/man/man8/qmqpd.8
View File

@ -61,8 +61,8 @@ The text below provides only a parameter summary. See
.ad
.fi
.IP "\fBcontent_filter (empty)\fR"
The name of a mail delivery transport that filters mail after
it is queued.
After the message is queued, send the entire message to the
specified \fItransport:destination\fR.
.IP "\fBreceive_override_options (empty)\fR"
Enable or disable recipient validation, built-in content
filtering, or address mapping.

4
postfix/man/man8/smtpd.8
View File

@ -170,8 +170,8 @@ an external content filter AFTER the mail is queued. This content
filter is expected to inject mail back into a (Postfix or other)
MTA for further delivery. See the FILTER_README document for details.
.IP "\fBcontent_filter (empty)\fR"
The name of a mail delivery transport that filters mail after
it is queued.
After the message is queued, send the entire message to the
specified \fItransport:destination\fR.
.SH "BEFORE QUEUE EXTERNAL CONTENT INSPECTION CONTROLS"
.na
.nf

2
postfix/mantools/postlink
View File

@ -355,7 +355,7 @@ while (<>) {
s;\bproxy_write_maps\b;<a href="postconf.5.html#proxy_write_maps">$&</a>;g;
s;\bqmgr_clog_warn_time\b;<a href="postconf.5.html#qmgr_clog_warn_time">$&</a>;g;
s;\bqmgr_fudge_factor\b;<a href="postconf.5.html#qmgr_fudge_factor">$&</a>;g;
s;\blegacy_filter_nexthop\b;<a href="postconf.5.html#legacy_filter_nexthop">$&</a>;g;
s;\bdefault_filter_nexthop\b;<a href="postconf.5.html#default_filter_nexthop">$&</a>;g;
s;\bqmgr_message_active_limit\b;<a href="postconf.5.html#qmgr_message_active_limit">$&</a>;g;
s;\bqmgr_message_recip[-</bB>]*\n* *[<bB>]*ient_limit\b;<a href="postconf.5.html#qmgr_message_recipient_limit">$&</a>;g;
s;\bqmgr_message_recip[-</bB>]*\n* *[<bB>]*ient_minimum\b;<a href="postconf.5.html#qmgr_message_recipient_minimum">$&</a>;g;

41
postfix/proto/FILTER_README.html
View File

@ -399,18 +399,19 @@ and causes mail to be given to the content filter instead. </p>
<p> The content_filter configuration parameter expects a value of
the form <i>transport:destination</i>. The <i>transport</i> name
specifies the first field of a mail delivery agent definition in
master.cf; the syntax of <i>destination</i> is described in the
manual page of the corresponding delivery agent. </p>
master.cf; the syntax of the next-hop <i>destination</i> is described
in the manual page of the corresponding delivery agent. </p>
<p> The meaning of an empty filter <i>destination</i> is version
dependent. Postfix 2.7 and later will use the recipient domain;
earlier versions will use $myhostname. Specify "legacy_filter_nexthop
= yes" for compatibility with Postfix 2.6 or earlier, or specify a
non-empty filter destination. </p>
<p> The meaning of an empty next-hop filter <i>destination</i> is
version dependent. Postfix 2.7 and later will use the recipient
domain; earlier versions will use $myhostname. Specify
"default_filter_nexthop = $myhostname" for compatibility with Postfix
2.6 or earlier, or specify a non-empty next-hop filter <i>destination</i>.
</p>
<p> The content_filter setting has a lower precedence than a content
filter that is specified with an access(5) table or in a header_checks(5)
or body_checks(5) table. </p>
<p> The content_filter setting has lower precedence than a FILTER
action that is specified in an access(5), header_checks(5) or
body_checks(5) table. </p>
<li> <p> Execute "<b>postfix reload</b>" to complete the change.
</p>
@ -625,18 +626,18 @@ of its final destination. </p>
<li> <p> The content_filter configuration parameter expects a value
of the form <i>transport:destination</i>. The <i>transport</i> name
specifies the first field of a mail delivery agent definition in
master.cf; the syntax of <i>destination</i> is described in the
manual page of the corresponding delivery agent. </p>
master.cf; the syntax of the next-hop <i>destination</i> is described
in the manual page of the corresponding delivery agent. </p>
<li> <p> The meaning of an empty filter <i>destination</i> is version
dependent. Postfix 2.7 and later will use the recipient domain;
earlier versions will use $myhostname. Specify "legacy_filter_nexthop
= yes" for compatibility with Postfix 2.6 or earlier, or specify a
non-empty filter destination. </p>
<li> <p> The meaning of an empty next-hop filter <i>destination</i>
is version dependent. Postfix 2.7 and later will use the recipient
domain; earlier versions will use $myhostname. Specify
"default_filter_nexthop = $myhostname" for compatibility with Postfix
2.6 or earlier, or specify a non-empty next-hop filter <i>destination</i>.
<li> <p> The content_filter setting has a lower precedence than a
content filter that is specified with an access(5) table or in a
header_checks(5) or body_checks(5) table. </p>
<li> <p> The content_filter setting has lower precedence than a
FILTER action that is specified in an access(5), header_checks(5)
or body_checks(5) table. </p>
</ul>

22
postfix/proto/access
View File

@ -274,10 +274,11 @@
# After the message is queued, send the entire message through
# the specified external content filter. The \fItransport\fR
# name specifies the first field of a mail delivery agent
# definition in master.cf; the syntax of \fIdestination\fR
# is described in the manual page of the corresponding delivery
# agent. More information about external content filters is
# in the Postfix FILTER_README file.
# definition in master.cf; the syntax of the next-hop
# \fIdestination\fR is described in the manual page of the
# corresponding delivery agent. More information about
# external content filters is in the Postfix FILTER_README
# file.
# .sp
# Note 1: do not use $\fInumber\fR regular expression
# substitutions for \fItransport\fR or \fIdestination\fR
@ -290,12 +291,13 @@
# .sp
# Note 3: the purpose of the FILTER command is to override
# message routing. To override the recipient's \fItransport\fR
# but not \fIdestination\fR, specify an empty \fIdestination\fR
# (Postfix 2.7 and later), or specify a \fItransport:destination\fR
# that delivers through a different Postfix instance (Postfix
# 2.6 and earlier). Other options are using the recipient-dependent
# \fBtrans\%port\%_maps\fR or the sen\%der-dependent
# \fBsender\%_de\%pen\%dent_default_trans\%port\%_maps\fR
# but not the next-hop \fIdestination\fR, specify an empty
# filter \fIdestination\fR (Postfix 2.7 and later), or specify
# a \fItransport:destination\fR that delivers through a
# different Postfix instance (Postfix 2.6 and earlier). Other
# options are using the recipient-dependent \fBtrans\%port\%_maps\fR
# or the sen\%der-dependent
# \fBsender\%_de\%pen\%dent\%_de\%fault\%_trans\%port\%_maps\fR
# features.
# .sp
# This feature is available in Postfix 2.0 and later.

22
postfix/proto/header_checks
View File

@ -182,10 +182,11 @@
# After the message is queued, send the entire message through
# the specified external content filter. The \fItransport\fR
# name specifies the first field of a mail delivery agent
# definition master.cf; the syntax of \fIdestination\fR is
# described in the manual page of the corresponding delivery
# agent. More information about external content filters is
# in the Postfix FILTER_README file.
# definition in master.cf; the syntax of the next-hop
# \fIdestination\fR is described in the manual page of the
# corresponding delivery agent. More information about
# external content filters is in the Postfix FILTER_README
# file.
# .sp
# Note 1: do not use $\fInumber\fR regular expression
# substitutions for \fItransport\fR or \fIdestination\fR
@ -198,12 +199,13 @@
# .sp
# Note 3: the purpose of the FILTER command is to override
# message routing. To override the recipient's \fItransport\fR
# but not \fIdestination\fR, specify an empty \fIdestination\fR
# (Postfix 2.7 and later), or specify a \fItransport:destination\fR
# that delivers through a different Postfix instance (Postfix
# 2.6 and earlier). Other options are using the recipient-dependent
# \fBtrans\%port\%_maps\fR or the sen\%der-dependent
# \fBsender\%_de\%pen\%dent_default_trans\%port\%_maps\fR
# but not the next-hop \fIdestination\fR, specify an empty
# filter \fIdestination\fR (Postfix 2.7 and later), or specify
# a \fItransport:destination\fR that delivers through a
# different Postfix instance (Postfix 2.6 and earlier). Other
# options are using the recipient-dependent \fBtrans\%port\%_maps\fR
# or the sen\%der-dependent
# \fBsender\%_de\%pen\%dent\%_de\%fault\%_trans\%port\%_maps\fR
# features.
# .sp
# This feature is available in Postfix 2.0 and later.

38
postfix/proto/postconf.proto
View File

@ -6864,24 +6864,25 @@ allowed set are replaced by underscores.
<p> After the message is queued, send the entire message to the
specified <i>transport:destination</i>. The <i>transport</i> name
specifies the first field of a mail delivery agent definition in
master.cf; the syntax of <i>destination</i> is described in the
manual page of the corresponding delivery agent. More information
about external content filters is in the Postfix FILTER_README file.
</p>
master.cf; the syntax of the next-hop <i>destination</i> is described
in the manual page of the corresponding delivery agent. More
information about external content filters is in the Postfix
FILTER_README file. </p>
<p> Notes: </p>
<ul>
<li> <p> This setting has a lower precedence than a content filter that
is specified with an access(5) table or in a header_checks(5) or
body_checks(5) table. </p>
<li> <p> This setting has lower precedence than a FILTER action
that is specified in an access(5), header_checks(5) or body_checks(5)
table. </p>
<li> <p> The meaning of an empty filter <i>destination</i> is version
dependent. Postfix 2.7 and later will use the recipient domain;
earlier versions will use $myhostname. Specify "legacy_filter_nexthop
= yes" for compatibility with Postfix 2.6 or earlier, or specify
a non-empty filter <i>destination</i>. </p>
<li> <p> The meaning of an empty next-hop filter <i>destination</i>
is version dependent. Postfix 2.7 and later will use the recipient
domain; earlier versions will use $myhostname. Specify
"default_filter_nexthop = $myhostname" for compatibility with Postfix
2.6 or earlier, or specify a content_filter value with an explicit
next-hop <i>destination</i>. </p>
</ul>
@ -12832,13 +12833,14 @@ setting for address verification probes. </p>
<p> This feature is available in Postfix 2.7 and later. </p>
%PARAM legacy_filter_nexthop no
%PARAM default_filter_nexthop
<p> When a FILTER command does not specify a destination, force the
destination to be $myhostname, instead of using the recipient domain.
Specify "legacy_filter_nexthop = yes" for compatibility with Postfix
version 2.6 and earlier, or specify a non-empty filter destination.
</p>
<p> When a content_filter or FILTER request specifies no explicit
next-hop destination, use $default_filter_nexthop instead; when
that value is empty, use the domain in the recipient address.
Specify "default_filter_nexthop = $myhostname" for compatibility
with Postfix version 2.6 and earlier, or specify an explicit next-hop
destination with each content_filter value or FILTER action. </p>
<p> This feature is available in Postfix 2.7 and later. </p>

6
postfix/src/global/mail_params.h
View File

@ -2253,9 +2253,9 @@ extern void mail_params_init(void);
#define DEF_FILTER_XPORT ""
extern char *var_filter_xport;
#define VAR_LEGACY_FILTER_NEXTHOP "legacy_filter_nexthop"
#define DEF_LEGACY_FILTER_NEXTHOP 0
extern bool var_legacy_filter_nexthop;
#define VAR_DEF_FILTER_NEXTHOP "default_filter_nexthop"
#define DEF_DEF_FILTER_NEXTHOP ""
extern char *var_def_filter_nexthop;
/*
* Fast flush service support.

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
* patchlevel; they change the release date only.
*/
#define MAIL_RELEASE_DATE "20100116"
#define MAIL_RELEASE_DATE "20100117"
#define MAIL_VERSION_NUMBER "2.7"
#ifdef SNAPSHOT

11
postfix/src/oqmgr/qmgr.c
View File

@ -159,9 +159,10 @@
/* character.
/* .PP
/* Available with Postfix version 2.7 and later:
/* .IP "\fBlegacy_filter_nexthop (no)\fR"
/* When a FILTER command does not specify a destination, force the
/* destination to be $myhostname, instead of using the recipient domain.
/* .IP "\fBdefault_filter_nexthop (empty)\fR"
/* When a content_filter or FILTER request specifies no explicit
/* next-hop destination, use $default_filter_nexthop instead; when
/* that value is empty, use the domain in the recipient address.
/* ACTIVE QUEUE CONTROLS
/* .ad
/* .fi
@ -374,7 +375,7 @@ char *var_conc_neg_feedback;
int var_conc_cohort_limit;
int var_conc_feedback_debug;
int var_dest_rate_delay;
bool var_legacy_filter_nexthop;
char *var_def_filter_nexthop;
static QMGR_SCAN *qmgr_scans[2];
@ -604,6 +605,7 @@ int main(int argc, char **argv)
VAR_DEFER_XPORTS, DEF_DEFER_XPORTS, &var_defer_xports, 0, 0,
VAR_CONC_POS_FDBACK, DEF_CONC_POS_FDBACK, &var_conc_pos_feedback, 1, 0,
VAR_CONC_NEG_FDBACK, DEF_CONC_NEG_FDBACK, &var_conc_neg_feedback, 1, 0,
VAR_DEF_FILTER_NEXTHOP, DEF_DEF_FILTER_NEXTHOP, &var_def_filter_nexthop, 0, 0,
0,
};
static const CONFIG_TIME_TABLE time_table[] = {
@ -633,7 +635,6 @@ int main(int argc, char **argv)
static const CONFIG_BOOL_TABLE bool_table[] = {
VAR_VERP_BOUNCE_OFF, DEF_VERP_BOUNCE_OFF, &var_verp_bounce_off,
VAR_CONC_FDBACK_DEBUG, DEF_CONC_FDBACK_DEBUG, &var_conc_feedback_debug,
VAR_LEGACY_FILTER_NEXTHOP, DEF_LEGACY_FILTER_NEXTHOP, &var_legacy_filter_nexthop,
0,
};

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

@ -1009,8 +1009,8 @@ static void qmgr_message_resolve(QMGR_MESSAGE *message)
reply.flags = 0;
vstring_strcpy(reply.transport, message->filter_xport);
if (FILTER_WITHOUT_NEXTHOP(STR(reply.transport), nexthop)
&& (var_legacy_filter_nexthop != 0
|| RCPT_WITHOUT_DOMAIN(recipient->address, nexthop)))
&& *(nexthop = var_def_filter_nexthop) == 0
&& RCPT_WITHOUT_DOMAIN(recipient->address, nexthop))
nexthop = var_myhostname;
vstring_strcpy(reply.nexthop, nexthop);
vstring_strcpy(reply.recipient, recipient->address);

4
postfix/src/pickup/pickup.c
View File

@ -46,8 +46,8 @@
/* .ad
/* .fi
/* .IP "\fBcontent_filter (empty)\fR"
/* The name of a mail delivery transport that filters mail after
/* it is queued.
/* After the message is queued, send the entire message to the
/* specified \fItransport:destination\fR.
/* .IP "\fBreceive_override_options (empty)\fR"
/* Enable or disable recipient validation, built-in content
/* filtering, or address mapping.

11
postfix/src/qmgr/qmgr.c
View File

@ -163,9 +163,10 @@
/* character.
/* .PP
/* Available with Postfix version 2.7 and later:
/* .IP "\fBlegacy_filter_nexthop (no)\fR"
/* When a FILTER command does not specify a destination, force the
/* destination to be $myhostname, instead of using the recipient domain.
/* .IP "\fBdefault_filter_nexthop (empty)\fR"
/* When a content_filter or FILTER request specifies no explicit
/* next-hop destination, use $default_filter_nexthop instead; when
/* that value is empty, use the domain in the recipient address.
/* ACTIVE QUEUE CONTROLS
/* .ad
/* .fi
@ -434,7 +435,7 @@ char *var_conc_neg_feedback;
int var_conc_cohort_limit;
int var_conc_feedback_debug;
int var_dest_rate_delay;
bool var_legacy_filter_nexthop;
char *var_def_filter_nexthop;
static QMGR_SCAN *qmgr_scans[2];
@ -671,6 +672,7 @@ int main(int argc, char **argv)
VAR_DEFER_XPORTS, DEF_DEFER_XPORTS, &var_defer_xports, 0, 0,
VAR_CONC_POS_FDBACK, DEF_CONC_POS_FDBACK, &var_conc_pos_feedback, 1, 0,
VAR_CONC_NEG_FDBACK, DEF_CONC_NEG_FDBACK, &var_conc_neg_feedback, 1, 0,
VAR_DEF_FILTER_NEXTHOP, DEF_DEF_FILTER_NEXTHOP, &var_def_filter_nexthop, 0, 0,
0,
};
static const CONFIG_TIME_TABLE time_table[] = {
@ -708,7 +710,6 @@ int main(int argc, char **argv)
static const CONFIG_BOOL_TABLE bool_table[] = {
VAR_VERP_BOUNCE_OFF, DEF_VERP_BOUNCE_OFF, &var_verp_bounce_off,
VAR_CONC_FDBACK_DEBUG, DEF_CONC_FDBACK_DEBUG, &var_conc_feedback_debug,
VAR_LEGACY_FILTER_NEXTHOP, DEF_LEGACY_FILTER_NEXTHOP, &var_legacy_filter_nexthop,
0,
};

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

@ -1068,8 +1068,8 @@ static void qmgr_message_resolve(QMGR_MESSAGE *message)
reply.flags = 0;
vstring_strcpy(reply.transport, message->filter_xport);
if (FILTER_WITHOUT_NEXTHOP(STR(reply.transport), nexthop)
&& (var_legacy_filter_nexthop != 0
|| RCPT_WITHOUT_DOMAIN(recipient->address, nexthop)))
&& *(nexthop = var_def_filter_nexthop) == 0
&& RCPT_WITHOUT_DOMAIN(recipient->address, nexthop))
nexthop = var_myhostname;
vstring_strcpy(reply.nexthop, nexthop);
vstring_strcpy(reply.recipient, recipient->address);

4
postfix/src/qmqpd/qmqpd.c
View File

@ -45,8 +45,8 @@
/* .ad
/* .fi
/* .IP "\fBcontent_filter (empty)\fR"
/* The name of a mail delivery transport that filters mail after
/* it is queued.
/* After the message is queued, send the entire message to the
/* specified \fItransport:destination\fR.
/* .IP "\fBreceive_override_options (empty)\fR"
/* Enable or disable recipient validation, built-in content
/* filtering, or address mapping.

12
postfix/src/smtpd/smtpd.c
View File

@ -150,8 +150,8 @@
/* filter is expected to inject mail back into a (Postfix or other)
/* MTA for further delivery. See the FILTER_README document for details.
/* .IP "\fBcontent_filter (empty)\fR"
/* The name of a mail delivery transport that filters mail after
/* it is queued.
/* After the message is queued, send the entire message to the
/* specified \fItransport:destination\fR.
/* BEFORE QUEUE EXTERNAL CONTENT INSPECTION CONTROLS
/* .ad
/* .fi
@ -3227,9 +3227,9 @@ static int vrfy_cmd(SMTPD_STATE *state, int argc, SMTPD_TOKEN *argv)
smtpd_chat_reply(state, "501 5.1.3 Bad recipient address syntax");
return (-1);
}
/* Not: state->addr_buf */
/* Use state->addr_buf, with the unquoted result from extract_addr() */
if (SMTPD_STAND_ALONE(state) == 0
&& (err = smtpd_check_rcpt(state, argv[1].strval)) != 0) {
&& (err = smtpd_check_rcpt(state, STR(state->addr_buf))) != 0) {
smtpd_chat_reply(state, "%s", err);
return (-1);
}
@ -3237,8 +3237,8 @@ static int vrfy_cmd(SMTPD_STATE *state, int argc, SMTPD_TOKEN *argv)
/*
* XXX 2821 new feature: Section 3.5.1 requires that the VRFY response is
* either "full name <user@domain>" or "user@domain". Postfix replies
* with the address that was provided by the client, whether or not it is
* in fully qualified domain form or not.
* with the string that was provided by the client, whether or not it is
* in fully qualified domain form and the address is in <>.
*
* Reply code 250 is reserved for the case where the address is verified;
* reply code 252 should be used when no definitive certainty exists.