mir/postfix
2
0
Fork 0
mirror of https://github.com/vdukhovni/postfix synced 2025-09-03 15:45:24 +00:00
Code Issues Releases Wiki Activity

postfix-2.3-20051126

Browse Source
This commit is contained in:
Wietse Venema
2005-11-26 00:00:00 -05:00
committed by Viktor Dukhovni
parent 4a1acc75b8
commit f9e259de31
17 changed files with 130 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
postfix/HISTORY
View File

@@ -11342,7 +11342,8 @@ Apologies for any names omitted.
a race condition. This time window was increased when queue a race condition. This time window was increased when queue
file creation was postponed from MAIL FROM until the first file creation was postponed from MAIL FROM until the first
accepted RCPT TO. The window is closed again. Found by accepted RCPT TO. The window is closed again. Found by
Victor. Files: global/mail_stream.c, global/mail_queue.c. Victor. Files: global/mail_stream.c, global/mail_queue.c,
cleanup/cleanup_message.c.
20051109 20051109
@@ -11457,6 +11458,14 @@ Apologies for any names omitted.
extended version of a patch by Mathias Hasselmann. Files: extended version of a patch by Mathias Hasselmann. Files:
smtp/smtp_connect.c, smtp/smtp_sasl_glue.c. smtp/smtp_connect.c, smtp/smtp_sasl_glue.c.
20051126
Workaround: log warning when REDIRECT or FILTER are used
in smtpd_end_of_data_restrictions. File: smtpd/smtpd_check.c.
Log warning when REDIRECT or FILTER are used in
smtpd_etrn_restrictions. File: smtpd/smtpd_check.c.
Open problems: Open problems:
"postsuper -r" no longer resets the message arrival time, "postsuper -r" no longer resets the message arrival time,
@@ -11464,8 +11473,8 @@ Open problems:
information. This can be a problem when mail "on hold" is information. This can be a problem when mail "on hold" is
released after a long time. released after a long time.
Is it safe to cache a connection after it has been used Is it safe to cache a connection after it has been used for
for more than some number of address verification probes? more than some number of address verification probes?
Access map actions such as FILTER and REDIRECT don't work Access map actions such as FILTER and REDIRECT don't work
in smtpd_end_of_data_restrictions (or anything else that in smtpd_end_of_data_restrictions (or anything else that
@@ -11546,8 +11555,6 @@ Open problems:
become arbitrarily short when an event is scheduled just become arbitrarily short when an event is scheduled just
before the current second rolls over. before the current second rolls over.
Low: per-sender resolver personalities?
Low: configurable internal/system locking method. Low: configurable internal/system locking method.
Low: make sure CCARGS -I options come at the end. Low: make sure CCARGS -I options come at the end.
@@ -11560,7 +11567,7 @@ Open problems:
Low: noise filter: allow smtp(8) to retry immediately if Low: noise filter: allow smtp(8) to retry immediately if
all MXes return a quick ECONNRESET or 4xx reply during the all MXes return a quick ECONNRESET or 4xx reply during the
initial handshake. initial handshake. Retry once? How many times?
Low: make post-install a "postfix-only script" so it can Low: make post-install a "postfix-only script" so it can
take data from the environment instead of main.cf. take data from the environment instead of main.cf.
@@ -11581,7 +11588,9 @@ Open problems:
unthrottle disabled transports or queues. unthrottle disabled transports or queues.
Med: postsuper -r should do something with recipients in Med: postsuper -r should do something with recipients in
bounce logfiles. bounce logfiles, to make sure the sender will be notified.
To be perfectly safe, no process other than the queue manager
should move a queue file from the active queue.
Low: postsuper re-run after renaming files, but only a Low: postsuper re-run after renaming files, but only a
limited number of times. limited number of times.

38
postfix/conf/access
View File

@@ -221,27 +221,33 @@
# transport(5) table to direct mail to the discard(8) # transport(5) table to direct mail to the discard(8)
# service. # service.
# #
# Note: this action currently does not work in
# smtpd_end_of_data_restrictions.
#
# This feature is available in Postfix 2.0 and later. # This feature is available in Postfix 2.0 and later.
# #
# DUNNO Pretend that the lookup key was not found. This # DUNNO Pretend that the lookup key was not found. This
# prevents Postfix from trying substrings of the # prevents Postfix from trying substrings of the
# lookup key (such as a subdomain name, or a network # lookup key (such as a subdomain name, or a network
# address subnetwork). # address subnetwork).
# #
# This feature is available in Postfix 2.0 and later. # This feature is available in Postfix 2.0 and later.
# #
# FILTER transport:destination # FILTER transport:destination
# After the message is queued, send the entire mes- # After the message is queued, send the entire mes-
# sage through the specified external content filter. # sage through the specified external content filter.
# The transport:destination syntax is described in # The transport:destination syntax is described in
# the transport(5) manual page. More information # the transport(5) manual page. More information
# about external content filters is in the Postfix # about external content filters is in the Postfix
# FILTER_README file. # FILTER_README file.
# #
# Note: this action overrides the main.cf con- # Note: this action overrides the main.cf con-
# tent_filter setting, and currently affects all # tent_filter setting, and currently affects all
# recipients of the message. # recipients of the message.
# #
# Note: this action currently does not work in
# smtpd_end_of_data_restrictions.
#
# This feature is available in Postfix 2.0 and later. # This feature is available in Postfix 2.0 and later.
# #
# HOLD optional text... # HOLD optional text...
@@ -262,27 +268,33 @@
# Note: this action currently affects all recipients # Note: this action currently affects all recipients
# of the message. # of the message.
# #
# Note: this action currently does not work in
# smtpd_end_of_data_restrictions.
#
# This feature is available in Postfix 2.0 and later. # This feature is available in Postfix 2.0 and later.
# #
# PREPEND headername: headervalue # PREPEND headername: headervalue
# Prepend the specified message header to the mes- # Prepend the specified message header to the mes-
# sage. When this action is used multiple times, the # sage. When this action is used multiple times, the
# first prepended header appears before the second # first prepended header appears before the second
# etc. prepended header. # etc. prepended header.
# #
# Note: this action does not support multi-line mes- # Note: this action does not support multi-line mes-
# sage headers. # sage headers.
# #
# This feature is available in Postfix 2.1 and later. # This feature is available in Postfix 2.1 and later.
# #
# REDIRECT user@domain # REDIRECT user@domain
# After the message is queued, send the message to # After the message is queued, send the message to
# the specified address instead of the intended # the specified address instead of the intended
# recipient(s). # recipient(s).
# #
# Note: this action overrides the FILTER action, and # Note: this action overrides the FILTER action, and
# currently affects all recipients of the message. # currently affects all recipients of the message.
# #
# Note: this action currently does not work in
# smtpd_end_of_data_restrictions.
#
# This feature is available in Postfix 2.1 and later. # This feature is available in Postfix 2.1 and later.
# #
# WARN optional text... # WARN optional text...

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

@@ -227,27 +227,33 @@ ACCESS(5) ACCESS(5)
<a href="transport.5.html">transport(5)</a> table to direct mail to the <a href="discard.8.html">discard(8)</a> <a href="transport.5.html">transport(5)</a> table to direct mail to the <a href="discard.8.html">discard(8)</a>
service. service.
Note: this action currently does not work in
<b><a href="postconf.5.html#smtpd_end_of_data_restrictions">smtpd_end_of_data_restrictions</a></b>.
This feature is available in Postfix 2.0 and later. This feature is available in Postfix 2.0 and later.
<b>DUNNO</b> Pretend that the lookup key was not found. This <b>DUNNO</b> Pretend that the lookup key was not found. This
prevents Postfix from trying substrings of the prevents Postfix from trying substrings of the
lookup key (such as a subdomain name, or a network lookup key (such as a subdomain name, or a network
address subnetwork). address subnetwork).
This feature is available in Postfix 2.0 and later. This feature is available in Postfix 2.0 and later.
<b>FILTER</b> <i>transport:destination</i> <b>FILTER</b> <i>transport:destination</i>
After the message is queued, send the entire mes- After the message is queued, send the entire mes-
sage through the specified external content filter. sage through the specified external content filter.
The <i>transport:destination</i> syntax is described in The <i>transport:destination</i> syntax is described in
the <a href="transport.5.html"><b>transport</b>(5)</a> manual page. More information the <a href="transport.5.html"><b>transport</b>(5)</a> manual page. More information
about external content filters is in the Postfix about external content filters is in the Postfix
<a href="FILTER_README.html">FILTER_README</a> file. <a href="FILTER_README.html">FILTER_README</a> file.
Note: this action overrides the <b>main.cf <a href="postconf.5.html#content_filter">con</a>-</b> Note: this action overrides the <b>main.cf <a href="postconf.5.html#content_filter">con</a>-</b>
<b><a href="postconf.5.html#content_filter">tent_filter</a></b> setting, and currently affects all <b><a href="postconf.5.html#content_filter">tent_filter</a></b> setting, and currently affects all
recipients of the message. recipients of the message.
Note: this action currently does not work in
<b><a href="postconf.5.html#smtpd_end_of_data_restrictions">smtpd_end_of_data_restrictions</a></b>.
This feature is available in Postfix 2.0 and later. This feature is available in Postfix 2.0 and later.
<b>HOLD</b> <i>optional text...</i> <b>HOLD</b> <i>optional text...</i>
@@ -268,27 +274,33 @@ ACCESS(5) ACCESS(5)
Note: this action currently affects all recipients Note: this action currently affects all recipients
of the message. of the message.
Note: this action currently does not work in
<b><a href="postconf.5.html#smtpd_end_of_data_restrictions">smtpd_end_of_data_restrictions</a></b>.
This feature is available in Postfix 2.0 and later. This feature is available in Postfix 2.0 and later.
<b>PREPEND</b> <i>headername: headervalue</i> <b>PREPEND</b> <i>headername: headervalue</i>
Prepend the specified message header to the mes- Prepend the specified message header to the mes-
sage. When this action is used multiple times, the sage. When this action is used multiple times, the
first prepended header appears before the second first prepended header appears before the second
etc. prepended header. etc. prepended header.
Note: this action does not support multi-line mes- Note: this action does not support multi-line mes-
sage headers. sage headers.
This feature is available in Postfix 2.1 and later. This feature is available in Postfix 2.1 and later.
<b>REDIRECT</b> <i>user@domain</i> <b>REDIRECT</b> <i>user@domain</i>
After the message is queued, send the message to After the message is queued, send the message to
the specified address instead of the intended the specified address instead of the intended
recipient(s). recipient(s).
Note: this action overrides the FILTER action, and Note: this action overrides the FILTER action, and
currently affects all recipients of the message. currently affects all recipients of the message.
Note: this action currently does not work in
<b><a href="postconf.5.html#smtpd_end_of_data_restrictions">smtpd_end_of_data_restrictions</a></b>.
This feature is available in Postfix 2.1 and later. This feature is available in Postfix 2.1 and later.
<b>WARN</b> <i>optional text...</i> <b>WARN</b> <i>optional text...</i>

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

@@ -10254,7 +10254,7 @@ deferred.
<p> <p>
The default mail delivery transport and next-hop destination for The default mail delivery transport and next-hop destination for
final delivery to domains listed with <a href="postconf.5.html#virtual_mailbox_domains">virtual_mailbox_domains</a>. final delivery to domains listed with $<a href="postconf.5.html#virtual_mailbox_domains">virtual_mailbox_domains</a>.
This information can be overruled with the <a href="transport.5.html">transport(5)</a> table. This information can be overruled with the <a href="transport.5.html">transport(5)</a> table.
</p> </p>

2
postfix/html/trivial-rewrite.8.html
View File

@@ -154,7 +154,7 @@ TRIVIAL-REWRITE(8) TRIVIAL-REWRITE(8)
<b><a href="postconf.5.html#virtual_transport">virtual_transport</a> (virtual)</b> <b><a href="postconf.5.html#virtual_transport">virtual_transport</a> (virtual)</b>
The default mail delivery transport and next-hop The default mail delivery transport and next-hop
destination for final delivery to domains listed destination for final delivery to domains listed
with <a href="postconf.5.html#virtual_mailbox_domains">virtual_mailbox_domains</a>. with $<a href="postconf.5.html#virtual_mailbox_domains">virtual_mailbox_domains</a>.
<b><a href="postconf.5.html#relay_transport">relay_transport</a> (relay)</b> <b><a href="postconf.5.html#relay_transport">relay_transport</a> (relay)</b>
The default mail delivery transport and next-hop The default mail delivery transport and next-hop

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

@@ -212,6 +212,9 @@ Note: this action currently affects all recipients of the message.
To discard only one recipient without discarding the entire message, To discard only one recipient without discarding the entire message,
use the transport(5) table to direct mail to the discard(8) service. use the transport(5) table to direct mail to the discard(8) service.
.sp .sp
Note: this action currently does not work in
\fBsmtpd_end_of_data_restrictions\fR.
.sp
This feature is available in Postfix 2.0 and later. This feature is available in Postfix 2.0 and later.
.IP \fBDUNNO\fR .IP \fBDUNNO\fR
Pretend that the lookup key was not found. This Pretend that the lookup key was not found. This
@@ -229,6 +232,9 @@ about external content filters is in the Postfix FILTER_README file.
Note: this action overrides the \fBmain.cf content_filter\fR setting, Note: this action overrides the \fBmain.cf content_filter\fR setting,
and currently affects all recipients of the message. and currently affects all recipients of the message.
.sp .sp
Note: this action currently does not work in
\fBsmtpd_end_of_data_restrictions\fR.
.sp
This feature is available in Postfix 2.0 and later. This feature is available in Postfix 2.0 and later.
.IP "\fBHOLD \fIoptional text...\fR" .IP "\fBHOLD \fIoptional text...\fR"
Place the message on the \fBhold\fR queue, where it will sit Place the message on the \fBhold\fR queue, where it will sit
@@ -246,6 +252,9 @@ or \fB$bounce_queue_lifetime\fR, or longer.
.sp .sp
Note: this action currently affects all recipients of the message. Note: this action currently affects all recipients of the message.
.sp .sp
Note: this action currently does not work in
\fBsmtpd_end_of_data_restrictions\fR.
.sp
This feature is available in Postfix 2.0 and later. This feature is available in Postfix 2.0 and later.
.IP "\fBPREPEND \fIheadername: headervalue\fR" .IP "\fBPREPEND \fIheadername: headervalue\fR"
Prepend the specified message header to the message. Prepend the specified message header to the message.
@@ -262,6 +271,9 @@ address instead of the intended recipient(s).
Note: this action overrides the FILTER action, and currently affects Note: this action overrides the FILTER action, and currently affects
all recipients of the message. all recipients of the message.
.sp .sp
Note: this action currently does not work in
\fBsmtpd_end_of_data_restrictions\fR.
.sp
This feature is available in Postfix 2.1 and later. This feature is available in Postfix 2.1 and later.
.IP "\fBWARN \fIoptional text...\fR .IP "\fBWARN \fIoptional text...\fR
Log a warning with the optional text, together with client information Log a warning with the optional text, together with client information

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

@@ -5951,7 +5951,7 @@ values less than this will be rejected, and the message will be
deferred. deferred.
.SH virtual_transport (default: virtual) .SH virtual_transport (default: virtual)
The default mail delivery transport and next-hop destination for The default mail delivery transport and next-hop destination for
final delivery to domains listed with virtual_mailbox_domains. final delivery to domains listed with $virtual_mailbox_domains.
This information can be overruled with the \fBtransport\fR(5) table. This information can be overruled with the \fBtransport\fR(5) table.
.PP .PP
Specify a string of the form \fItransport:nexthop\fR, where \fItransport\fR Specify a string of the form \fItransport:nexthop\fR, where \fItransport\fR

2
postfix/man/man8/trivial-rewrite.8
View File

@@ -146,7 +146,7 @@ for final delivery to domains listed with mydestination, and for
[ipaddress] destinations that match $inet_interfaces or $proxy_interfaces. [ipaddress] destinations that match $inet_interfaces or $proxy_interfaces.
.IP "\fBvirtual_transport (virtual)\fR" .IP "\fBvirtual_transport (virtual)\fR"
The default mail delivery transport and next-hop destination for The default mail delivery transport and next-hop destination for
final delivery to domains listed with virtual_mailbox_domains. final delivery to domains listed with $virtual_mailbox_domains.
.IP "\fBrelay_transport (relay)\fR" .IP "\fBrelay_transport (relay)\fR"
The default mail delivery transport and next-hop destination for The default mail delivery transport and next-hop destination for
remote delivery to domains listed with $relay_domains. remote delivery to domains listed with $relay_domains.

12
postfix/proto/access
View File

@@ -192,6 +192,9 @@
# To discard only one recipient without discarding the entire message, # To discard only one recipient without discarding the entire message,
# use the transport(5) table to direct mail to the discard(8) service. # use the transport(5) table to direct mail to the discard(8) service.
# .sp # .sp
# Note: this action currently does not work in
# \fBsmtpd_end_of_data_restrictions\fR.
# .sp
# This feature is available in Postfix 2.0 and later. # This feature is available in Postfix 2.0 and later.
# .IP \fBDUNNO\fR # .IP \fBDUNNO\fR
# Pretend that the lookup key was not found. This # Pretend that the lookup key was not found. This
@@ -209,6 +212,9 @@
# Note: this action overrides the \fBmain.cf content_filter\fR setting, # Note: this action overrides the \fBmain.cf content_filter\fR setting,
# and currently affects all recipients of the message. # and currently affects all recipients of the message.
# .sp # .sp
# Note: this action currently does not work in
# \fBsmtpd_end_of_data_restrictions\fR.
# .sp
# This feature is available in Postfix 2.0 and later. # This feature is available in Postfix 2.0 and later.
# .IP "\fBHOLD \fIoptional text...\fR" # .IP "\fBHOLD \fIoptional text...\fR"
# Place the message on the \fBhold\fR queue, where it will sit # Place the message on the \fBhold\fR queue, where it will sit
@@ -226,6 +232,9 @@
# .sp # .sp
# Note: this action currently affects all recipients of the message. # Note: this action currently affects all recipients of the message.
# .sp # .sp
# Note: this action currently does not work in
# \fBsmtpd_end_of_data_restrictions\fR.
# .sp
# This feature is available in Postfix 2.0 and later. # This feature is available in Postfix 2.0 and later.
# .IP "\fBPREPEND \fIheadername: headervalue\fR" # .IP "\fBPREPEND \fIheadername: headervalue\fR"
# Prepend the specified message header to the message. # Prepend the specified message header to the message.
@@ -242,6 +251,9 @@
# Note: this action overrides the FILTER action, and currently affects # Note: this action overrides the FILTER action, and currently affects
# all recipients of the message. # all recipients of the message.
# .sp # .sp
# Note: this action currently does not work in
# \fBsmtpd_end_of_data_restrictions\fR.
# .sp
# This feature is available in Postfix 2.1 and later. # This feature is available in Postfix 2.1 and later.
# .IP "\fBWARN \fIoptional text...\fR # .IP "\fBWARN \fIoptional text...\fR
# Log a warning with the optional text, together with client information # Log a warning with the optional text, together with client information

2
postfix/proto/postconf.proto
View File

@@ -7714,7 +7714,7 @@ deferred.
<p> <p>
The default mail delivery transport and next-hop destination for The default mail delivery transport and next-hop destination for
final delivery to domains listed with virtual_mailbox_domains. final delivery to domains listed with $virtual_mailbox_domains.
This information can be overruled with the transport(5) table. This information can be overruled with the transport(5) table.
</p> </p>

10
postfix/src/bounce/bounce_template.c
View File

@@ -12,7 +12,8 @@
/* void bounce_template_free(template) /* void bounce_template_free(template)
/* BOUNCE_TEMPLATE *template; /* BOUNCE_TEMPLATE *template;
/* /*
/* void bounce_template_load(stream, buffer, origin) /* void bounce_template_load(template, stream, buffer, origin)
/* BOUNCE_TEMPLATE *template;
/* VSTREAM *stream; /* VSTREAM *stream;
/* const char *buffer; /* const char *buffer;
/* const char *origin; /* const char *origin;
@@ -57,8 +58,8 @@
/* /*
/* bounce_template_free() destroys a bounce message template. /* bounce_template_free() destroys a bounce message template.
/* /*
/* bounce_template_load() reads a bounce template from the /* bounce_template_load() overrides a bounce template with the
/* specified buffer with the specified origin. The buffer and /* specified buffer from the specified origin. The buffer and
/* origin are copied. Specify a null buffer and origin pointer /* origin are copied. Specify a null buffer and origin pointer
/* to reset the template to the defaults specified with /* to reset the template to the defaults specified with
/* bounce_template_create(). /* bounce_template_create().
@@ -340,7 +341,7 @@ static void bounce_template_parse_buffer(BOUNCE_TEMPLATE *tp)
/* /*
* Is this 7bit or 8bit text? If the character set is US-ASCII, then * Is this 7bit or 8bit text? If the character set is US-ASCII, then
* don't allow 8bit text. * don't allow 8bit text. Don't assume 8bit when charset was changed.
*/ */
#define NON_ASCII(p) (*(p) && !allascii((p))) #define NON_ASCII(p) (*(p) && !allascii((p)))
@@ -401,6 +402,7 @@ static const char *bounce_template_lookup(const char *key, int unused_mode,
tp->origin, result, tp->class, key); tp->origin, result, tp->class, key);
msg_warn("please increase time unit \"%s\" of \"%s\" " msg_warn("please increase time unit \"%s\" of \"%s\" "
"in %s template", bd->suffix, key, tp->class); "in %s template", bd->suffix, key, tp->class);
msg_warn("for instructions see the bounce(5) manual");
} else if (result == 0 && bp->value[0] && bd->divisor > 1) { } else if (result == 0 && bp->value[0] && bd->divisor > 1) {
msg_warn("%s: zero result in %s template " msg_warn("%s: zero result in %s template "
"conversion of parameter \"%s\"", "conversion of parameter \"%s\"",

2
postfix/src/bounce/bounce_templates.c
View File

@@ -41,7 +41,7 @@
/* bounce_templates_free() destroys a bounce template group. /* bounce_templates_free() destroys a bounce template group.
/* /*
/* bounce_templates_load() reads zero or more bounce templates /* bounce_templates_load() reads zero or more bounce templates
/* from the specified file. /* from the specified file to override built-in templates.
/* /*
/* bounce_templates_expand() expands $name macros and writes /* bounce_templates_expand() expands $name macros and writes
/* the text portions of the specified bounce template group /* the text portions of the specified bounce template group

4
postfix/src/cleanup/cleanup_extracted.c
View File

@@ -237,6 +237,10 @@ void cleanup_extracted_process(CLEANUP_STATE *state, int type,
/* /*
* Extracted envelope non-recipient record processing. * Extracted envelope non-recipient record processing.
*
* XXX We currently cannot have FILTER, REDIRECT etc. action records after
* the message content, as that would break the use of "postsuper -r" to
* reset such information. See also smtpd/smtpd_check.c.
*/ */
if (state->flags & CLEANUP_FLAG_INRCPT) if (state->flags & CLEANUP_FLAG_INRCPT)
/* Tell qmgr that recipient records are mixed with other information. */ /* Tell qmgr that recipient records are mixed with other information. */

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 "20051125" #define MAIL_RELEASE_DATE "20051126"
#define MAIL_VERSION_NUMBER "2.3" #define MAIL_VERSION_NUMBER "2.3"
#ifdef SNAPSHOT #ifdef SNAPSHOT

4
postfix/src/global/resolve_clnt.c
View File

@@ -244,8 +244,8 @@ void resolve_clnt(const char *class, const char *sender,
var_rewrite_service); var_rewrite_service);
} else { } else {
if (msg_verbose) if (msg_verbose)
msg_info("%s: `%s' -> transp=`%s' host=`%s' rcpt=`%s' flags=%s%s%s%s class=%s%s%s%s%s", msg_info("%s: `%s' -> `%s' -> transp=`%s' host=`%s' rcpt=`%s' flags=%s%s%s%s class=%s%s%s%s%s",
myname, addr, STR(reply->transport), myname, sender, addr, STR(reply->transport),
STR(reply->nexthop), STR(reply->recipient), STR(reply->nexthop), STR(reply->recipient),
IFSET(RESOLVE_FLAG_FINAL, "final"), IFSET(RESOLVE_FLAG_FINAL, "final"),
IFSET(RESOLVE_FLAG_ROUTED, "routed"), IFSET(RESOLVE_FLAG_ROUTED, "routed"),

20
postfix/src/smtpd/smtpd_check.c
View File

@@ -1835,6 +1835,26 @@ static int can_delegate_action(SMTPD_STATE *state, const char *table,
table, VAR_SMTPD_PROXY_FILT, action); table, VAR_SMTPD_PROXY_FILT, action);
return (0); return (0);
} }
/*
* XXX We currently cannot have FILTER, REDIRECT etc. action records
* after the message content, as that would break the use of "postsuper
* -r" to reset such information. See cleanup/cleanup_extracted.c.
*/
if (strcmp(state->where, SMTPD_AFTER_DOT) == 0) {
msg_warn("access table %s: action %s is unavailable in %s",
table, action, VAR_EOD_CHECKS);
return (0);
}
/*
* ETRN does not receive mail so we can't store queue file records.
*/
if (strcmp(state->where, "ETRN") == 0) {
msg_warn("access table %s: action %s is unavailable in %s",
table, action, VAR_ETRN_CHECKS);
return (0);
}
return (not_in_client_helo(state, table, action, reply_class)); return (not_in_client_helo(state, table, action, reply_class));
} }

2
postfix/src/trivial-rewrite/trivial-rewrite.c
View File

@@ -124,7 +124,7 @@
/* [ipaddress] destinations that match $inet_interfaces or $proxy_interfaces. /* [ipaddress] destinations that match $inet_interfaces or $proxy_interfaces.
/* .IP "\fBvirtual_transport (virtual)\fR" /* .IP "\fBvirtual_transport (virtual)\fR"
/* The default mail delivery transport and next-hop destination for /* The default mail delivery transport and next-hop destination for
/* final delivery to domains listed with virtual_mailbox_domains. /* final delivery to domains listed with $virtual_mailbox_domains.
/* .IP "\fBrelay_transport (relay)\fR" /* .IP "\fBrelay_transport (relay)\fR"
/* The default mail delivery transport and next-hop destination for /* The default mail delivery transport and next-hop destination for
/* remote delivery to domains listed with $relay_domains. /* remote delivery to domains listed with $relay_domains.