From: Wietse Venema Date: Tue, 27 Aug 2002 05:00:00 +0000 (-0500) Subject: postfix-1.1.11-20020827 X-Git-Tag: v2.0.0~44 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98c469440768ce5957c45b01d16eed8e2158c05a;p=thirdparty%2Fpostfix.git postfix-1.1.11-20020827 --- diff --git a/postfix/conf/access b/postfix/conf/access index 027027776..9de3e5524 100644 --- a/postfix/conf/access +++ b/postfix/conf/access @@ -127,45 +127,54 @@ # destroyed or released with the postsuper(1) com- # mand. # +# Note: this action currently affects all recipients +# of the message. +# # DISCARD -# Claim successful delivery and silently discard the +# Claim successful delivery and silently discard the # message. # +# Note: this action currently affects all recipients +# of the message. +# # FILTER transport:destination # After the message is queued, send the entire mes- # sage through a content filter. More information # about content filters is in the Postfix FIL- # TER_README file. # +# Note: this action currently affects all recipients +# of the message. +# # restriction... # Apply the named UCE restriction(s) (permit, reject, # reject_unauth_destination, and so on). # # REGULAR EXPRESSION TABLES -# This section describes how the table lookups change when +# This section describes how the table lookups change when # the table is given in the form of regular expressions. For -# a description of regular expression lookup table syntax, +# a description of regular expression lookup table syntax, # see regexp_table(5) or pcre_table(5). # -# Each pattern is a regular expression that is applied to +# Each pattern is a regular expression that is applied to # the entire string being looked up. Depending on the appli- -# cation, that string is an entire client hostname, an +# cation, that string is an entire client hostname, an # entire client IP address, or an entire mail address. Thus, # no parent domain or parent network search is done, -# user@domain mail addresses are not broken up into their +# user@domain mail addresses are not broken up into their # user@ and domain constituent parts, nor is user+foo broken # up into user and foo. # -# Patterns are applied in the order as specified in the -# table, until a pattern is found that matches the search +# Patterns are applied in the order as specified in the +# table, until a pattern is found that matches the search # string. # -# Actions are the same as with indexed file lookups, with -# the additional feature that parenthesized substrings from +# Actions are the same as with indexed file lookups, with +# the additional feature that parenthesized substrings from # the pattern can be interpolated as $1, $2 and so on. # # BUGS -# The table format does not understand quoting conventions. +# The table format does not understand quoting conventions. # # SEE ALSO # postmap(1) create mapping table @@ -174,7 +183,7 @@ # regexp_table(5) format of POSIX regular expression tables # # LICENSE -# The Secure Mailer license must be distributed with this +# The Secure Mailer license must be distributed with this # software. # # AUTHOR(S) diff --git a/postfix/html/access.5.html b/postfix/html/access.5.html index e05788024..db7a589f1 100644 --- a/postfix/html/access.5.html +++ b/postfix/html/access.5.html @@ -128,45 +128,54 @@ ACCESS(5) ACCESS(5) destroyed or released with the postsuper(1) com- mand. + Note: this action currently affects all recipients + of the message. + DISCARD - Claim successful delivery and silently discard the + Claim successful delivery and silently discard the message. + Note: this action currently affects all recipients + of the message. + FILTER transport:destination After the message is queued, send the entire mes- sage through a content filter. More information about content filters is in the Postfix FIL- TER_README file. + Note: this action currently affects all recipients + of the message. + restriction... Apply the named UCE restriction(s) (permit, reject, reject_unauth_destination, and so on). REGULAR EXPRESSION TABLES - This section describes how the table lookups change when + This section describes how the table lookups change when the table is given in the form of regular expressions. For - a description of regular expression lookup table syntax, + a description of regular expression lookup table syntax, see regexp_table(5) or pcre_table(5). - Each pattern is a regular expression that is applied to + Each pattern is a regular expression that is applied to the entire string being looked up. Depending on the appli- - cation, that string is an entire client hostname, an + cation, that string is an entire client hostname, an entire client IP address, or an entire mail address. Thus, no parent domain or parent network search is done, - user@domain mail addresses are not broken up into their + user@domain mail addresses are not broken up into their user@ and domain constituent parts, nor is user+foo broken up into user and foo. - Patterns are applied in the order as specified in the - table, until a pattern is found that matches the search + Patterns are applied in the order as specified in the + table, until a pattern is found that matches the search string. - Actions are the same as with indexed file lookups, with - the additional feature that parenthesized substrings from + Actions are the same as with indexed file lookups, with + the additional feature that parenthesized substrings from the pattern can be interpolated as $1, $2 and so on. BUGS - The table format does not understand quoting conventions. + The table format does not understand quoting conventions. SEE ALSO postmap(1) create mapping table @@ -175,7 +184,7 @@ ACCESS(5) ACCESS(5) regexp_table(5) format of POSIX regular expression tables LICENSE - The Secure Mailer license must be distributed with this + The Secure Mailer license must be distributed with this software. AUTHOR(S) diff --git a/postfix/html/uce.html b/postfix/html/uce.html index 1dd3b0025..d934484ef 100644 --- a/postfix/html/uce.html +++ b/postfix/html/uce.html @@ -395,11 +395,27 @@ be inspected with the postcat command, and can be destroyed or taken off hold with the postsuper command. + Note: this action currently affects all recipients of a message. +

DISCARD
Claim successful delivery and silently discard the message. + Note: this action currently affects all recipients of a message. + +

+ +

FILTER transport:nexthop
+After the message is queued, send the entire message through +a content filter. This requires different cleanup servers +before and after the filter, with header/body checks turned +off in the second cleanup server. More details about content +filtering are in the Postfix FILTER_README file. This feature +overrides the main.cf content_filter setting. + + Note: this action currently affects all recipients of a message. +

Other
Treat the result as another list of UCE restrictions. diff --git a/postfix/man/man5/access.5 b/postfix/man/man5/access.5 index 9bc3af64b..3e28f8eaf 100644 --- a/postfix/man/man5/access.5 +++ b/postfix/man/man5/access.5 @@ -124,12 +124,18 @@ until someone either deletes it or releases it for delivery. Mail that is placed on hold can be examined with the \fBpostcat\fR(1) command, and can be destroyed or released with the \fBpostsuper\fR(1) command. +.sp +Note: this action currently affects all recipients of the message. .IP \fBDISCARD\fR Claim successful delivery and silently discard the message. +.sp +Note: this action currently affects all recipients of the message. .IP "\fBFILTER \fItransport:destination\fR" After the message is queued, send the entire message through a content filter. More information about content filters is in the Postfix FILTER_README file. +.sp +Note: this action currently affects all recipients of the message. .IP \fIrestriction...\fR Apply the named UCE restriction(s) (\fBpermit\fR, \fBreject\fR, \fBreject_unauth_destination\fR, and so on). diff --git a/postfix/proto/access b/postfix/proto/access index 02e99839e..4352a7289 100644 --- a/postfix/proto/access +++ b/postfix/proto/access @@ -108,12 +108,18 @@ # Mail that is placed on hold can be examined with the # \fBpostcat\fR(1) command, and can be destroyed or released with # the \fBpostsuper\fR(1) command. +# .sp +# Note: this action currently affects all recipients of the message. # .IP \fBDISCARD\fR # Claim successful delivery and silently discard the message. +# .sp +# Note: this action currently affects all recipients of the message. # .IP "\fBFILTER \fItransport:destination\fR" # After the message is queued, send the entire message through # a content filter. More information about content filters # is in the Postfix FILTER_README file. +# .sp +# Note: this action currently affects all recipients of the message. # .IP \fIrestriction...\fR # Apply the named UCE restriction(s) (\fBpermit\fR, \fBreject\fR, # \fBreject_unauth_destination\fR, and so on). diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h index 00e71864a..af88095e0 100644 --- a/postfix/src/global/mail_version.h +++ b/postfix/src/global/mail_version.h @@ -20,7 +20,7 @@ * Patches change the patchlevel and the release date. Snapshots change the * release date only, unless they include the same bugfix as a patch release. */ -#define MAIL_RELEASE_DATE "20020826" +#define MAIL_RELEASE_DATE "20020827" #define VAR_MAIL_VERSION "mail_version" #define DEF_MAIL_VERSION "1.1.11-" MAIL_RELEASE_DATE diff --git a/postfix/src/smtpd/smtpd_check.c b/postfix/src/smtpd/smtpd_check.c index 9c0a75613..6dd9a206e 100644 --- a/postfix/src/smtpd/smtpd_check.c +++ b/postfix/src/smtpd/smtpd_check.c @@ -2367,10 +2367,10 @@ static int generic_checks(SMTPD_STATE *state, ARGV *restrictions, state->recursion = saved_recursion; - if (status == SMTPD_CHECK_REJECT || status == SMTPD_CHECK_DUNNO) + if (status == SMTPD_CHECK_OK || status == SMTPD_CHECK_DUNNO) if (state->defer_if_permit) status = smtpd_check_reject(state, state->defer_class, - "450 %s", STR(state->defer_reason)); + "%s", STR(state->defer_reason)); return (status); }