From ae16906d8dbfecfc8e2bf09d3320e13fcb60f76d Mon Sep 17 00:00:00 2001 From: Wietse Venema Date: Thu, 3 Feb 2000 00:00:00 +0000 Subject: [PATCH] snapshot-20000203 --- postfix/HISTORY | 9 +++++++++ postfix/RELEASE_NOTES | 6 +++--- postfix/cleanup/cleanup_envelope.c | 5 +++-- postfix/cleanup/cleanup_message.c | 14 ++++---------- postfix/conf/access | 13 +++++++------ postfix/global/bounce.h | 3 +-- postfix/global/mail_stream.c | 3 +-- postfix/global/mail_version.h | 2 +- postfix/html/access.5.html | 24 ++++++++++++------------ postfix/html/faq.html | 2 +- postfix/html/local.8.html | 2 +- postfix/local/local.c | 2 +- postfix/man/man5/access.5 | 13 +++++++------ postfix/man/man8/local.8 | 2 +- 14 files changed, 52 insertions(+), 48 deletions(-) diff --git a/postfix/HISTORY b/postfix/HISTORY index 0ecf4d171..679a788a8 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -3612,6 +3612,15 @@ Apologies for any names omitted. excess mail so that one site with a large backlog does not block other deliveries. +20000128 + + Cleanup: the queue manager no longer replaces the nexthop + field by the recipient localpart when a destination matches + $mydestination/$inet_interfaces. The price is the introduction + of a new parameter local_destination_recipient_limit which + defaults to 1 i order to maintain backwards compatibility. + Files: qmgr/qmgr.c, qmgr/qmgr_message.c. + 20000129 Bugfix: extracted recipients were misfiled when a message diff --git a/postfix/RELEASE_NOTES b/postfix/RELEASE_NOTES index 506e100dc..ac4111da2 100644 --- a/postfix/RELEASE_NOTES +++ b/postfix/RELEASE_NOTES @@ -1,13 +1,13 @@ -Incompatible changes with snapshot-20000104 +Incompatible changes with snapshot-20000203 =========================================== None sofar. -Major changes with snapshot-20000104 +Major changes with snapshot-20000203 ==================================== Questionable feature: with "smtp_skip_5xx_greeting = yes", Postfix -emulates brain damage found in some other MTAs. +emulates behavior found in some other MTAs. Incompatible changes with postfix-19991231: =========================================== diff --git a/postfix/cleanup/cleanup_envelope.c b/postfix/cleanup/cleanup_envelope.c index 0a4faf43c..86e1fc410 100644 --- a/postfix/cleanup/cleanup_envelope.c +++ b/postfix/cleanup/cleanup_envelope.c @@ -16,7 +16,8 @@ /* This module processes envelope records and writes the result /* to the queue file. It validates the message structure, rewrites /* sender/recipient addresses to canonical form, and expands recipients -/* according to entries in the virtual table. +/* according to entries in the virtual table. This routine absorbs but +/* does not emit the envelope to content boundary record. /* /* Arguments: /* .IP state @@ -69,7 +70,7 @@ static void cleanup_envelope_process(CLEANUP_STATE *, int, char *, int); -/* cleanup_envelope - process message envelope */ +/* cleanup_envelope - initialize message envelope */ void cleanup_envelope(CLEANUP_STATE *state, int type, char *str, int len) { diff --git a/postfix/cleanup/cleanup_message.c b/postfix/cleanup/cleanup_message.c index 406b7235f..532ddce5d 100644 --- a/postfix/cleanup/cleanup_message.c +++ b/postfix/cleanup/cleanup_message.c @@ -17,6 +17,8 @@ /* sender/recipient addresses to canonical form, inserts missing /* message headers, and extracts information from message headers /* to be used later when generating the extracted output segment. +/* This routine absorbs but does not emit the content to extracted +/* boundary record. /* /* Arguments: /* .IP state @@ -427,6 +429,8 @@ static void cleanup_message_header(CLEANUP_STATE *state, int type, char *buf, in VSTRING_ADDCH(state->header_buf, '\n'); vstring_strcat(state->header_buf, buf); return; + } else { + /* Body record or end of message segment. */ ; } /* @@ -469,16 +473,6 @@ static void cleanup_message_body(CLEANUP_STATE *state, int type, char *buf, int char *myname = "cleanup_message_body"; long xtra_offset; - /* - * Sanity check. - */ - if (strchr(REC_TYPE_CONTENT, type) == 0) { - msg_warn("%s: %s: unexpected record type %d", - state->queue_id, myname, type); - state->errs |= CLEANUP_STAT_BAD; - return; - } - /* * Copy body record to the output. */ diff --git a/postfix/conf/access b/postfix/conf/access index ba45f0d2e..6fcde8c3f 100644 --- a/postfix/conf/access +++ b/postfix/conf/access @@ -70,15 +70,16 @@ # regular expression lookup table syntax, see \fBregexp_table\fR(5) # or \fBpcre_table\fR(5). # -# Patterns become regular expressions that are applied to the entire +# Each pattern is a regular expression that is applied to the entire # string being looked up. Depending on the application, that string # is an entire client hostname, an entire client IP address, or an -# entire mail address. +# entire mail address. Patterns are applied in order as specified, +# until a pattern is found that matches the search string. # -# In contrast to the normal lookups from indexed files, no parent -# domain or network search is done, and \fIuser@domain\fR mail -# addresses are not broken up into their \fIuser@\fR and \fIdomain\fR -# constituent parts. +# In contrast to lookups from indexed files, no parent domain or +# parent network search is done with regular expression tables, +# and \fIuser@domain\fR mail addresses are not broken up into their +# \fIuser@\fR and \fIdomain\fR constituent parts. # # Actions are the same as with normal indexed file lookups, with # the additional feature that parenthesized substrings from the diff --git a/postfix/global/bounce.h b/postfix/global/bounce.h index 632d62fb0..ccee874ef 100644 --- a/postfix/global/bounce.h +++ b/postfix/global/bounce.h @@ -38,8 +38,7 @@ extern int vbounce_recip(int, const char *, const char *, const char *, */ #define BOUNCE_CMD_APPEND 0 /* append log */ #define BOUNCE_CMD_FLUSH 1 /* send log */ -#define BOUNCE_CMD_WARN 2 /* send warning bounce, don't delete - * log */ +#define BOUNCE_CMD_WARN 2 /* send warning bounce, don't delete log */ #define BOUNCE_CMD_RECIP 3 /* immediate bounce, no logfile */ /* diff --git a/postfix/global/mail_stream.c b/postfix/global/mail_stream.c index a51c8f496..8680c026a 100644 --- a/postfix/global/mail_stream.c +++ b/postfix/global/mail_stream.c @@ -14,9 +14,8 @@ /* .in -4 /* } MAIL_STREAM; /* -/* MAIL_STREAM *mail_stream_file(queue, mode, class, service) +/* MAIL_STREAM *mail_stream_file(queue, class, service) /* const char *queue; -/* int mode; /* const char *class; /* const char *service; /* diff --git a/postfix/global/mail_version.h b/postfix/global/mail_version.h index 8303e414f..956d19670 100644 --- a/postfix/global/mail_version.h +++ b/postfix/global/mail_version.h @@ -15,7 +15,7 @@ * Version of this program. */ #define VAR_MAIL_VERSION "mail_version" -#define DEF_MAIL_VERSION "Snapshot-20000130" +#define DEF_MAIL_VERSION "Snapshot-20000203" extern char *var_mail_version; /* LICENSE diff --git a/postfix/html/access.5.html b/postfix/html/access.5.html index 3c0de66f9..47059a1a1 100644 --- a/postfix/html/access.5.html +++ b/postfix/html/access.5.html @@ -100,15 +100,17 @@ ACCESS(5) ACCESS(5) a description of regular expression lookup table syntax, see regexp_table(5) or pcre_table(5). - Patterns become regular expressions that are 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 - entire client IP address, or an entire mail address. + entire client IP address, or an entire mail address. Pat- + terns are applied in order as specified, until a pattern + is found that matches the search string. - In contrast to the normal lookups from indexed files, no - parent domain or network search is done, and user@domain - mail addresses are not broken up into their user@ and - domain constituent parts. + In contrast to lookups from indexed files, no parent + domain or parent network search is done with regular + expression tables, and user@domain mail addresses are not + broken up into their user@ and domain constituent parts. Actions are the same as with normal indexed file lookups, with the additional feature that parenthesized substrings @@ -120,11 +122,9 @@ ACCESS(5) ACCESS(5) SEE ALSO postmap(1) create mapping table smtpd(8) smtp server - pcre_table(5) format of PCRE tables - regexp_table(5) format of POSIX regexp tables + pcre_table(5) format of PCRE tables + regexp_table(5) format of POSIX regexp tables -LICENSE - The Secure Mailer license must be distributed with this @@ -137,6 +137,8 @@ ACCESS(5) ACCESS(5) ACCESS(5) ACCESS(5) +LICENSE + The Secure Mailer license must be distributed with this software. AUTHOR(S) @@ -189,8 +191,6 @@ ACCESS(5) ACCESS(5) - - diff --git a/postfix/html/faq.html b/postfix/html/faq.html index f26e92fae..5e574906a 100644 --- a/postfix/html/faq.html +++ b/postfix/html/faq.html @@ -1289,7 +1289,7 @@ in /etc/postfix/master.cf, specify: 
     /etc/postfix/main.cf:
-        local_recipient_maps = $relocated_maps $alias_maps, unix:passwd.byname
+        local_recipient_maps = $alias_maps, unix:passwd.byname

diff --git a/postfix/html/local.8.html b/postfix/html/local.8.html index 26e48689e..a4c1574d3 100644 --- a/postfix/html/local.8.html +++ b/postfix/html/local.8.html @@ -252,7 +252,7 @@ LOCAL(8) LOCAL(8) ward+foo or in ~name/.forward, to the mailbox owned by the user name, or it is sent back as undeliverable. - In all cases the local daemon prepends an opional `Deliv- + In all cases the local daemon prepends an optional `Deliv- ered-To: name+foo' header line. DELIVERY RIGHTS diff --git a/postfix/local/local.c b/postfix/local/local.c index 90c6ff84d..94bcb9799 100644 --- a/postfix/local/local.c +++ b/postfix/local/local.c @@ -214,7 +214,7 @@ /* to the mailbox owned by the user \fIname\fR, or it is sent back as /* undeliverable. /* -/* In all cases the \fBlocal\fR daemon prepends an opional +/* In all cases the \fBlocal\fR daemon prepends an optional /* `\fBDelivered-To:\fR \fIname\fR+\fIfoo\fR' header line. /* DELIVERY RIGHTS /* .ad diff --git a/postfix/man/man5/access.5 b/postfix/man/man5/access.5 index f923d7353..4791bf88c 100644 --- a/postfix/man/man5/access.5 +++ b/postfix/man/man5/access.5 @@ -84,15 +84,16 @@ is given in the form of regular expressions. For a description of regular expression lookup table syntax, see \fBregexp_table\fR(5) or \fBpcre_table\fR(5). -Patterns become regular expressions that are applied to the entire +Each pattern is a regular expression that is applied to the entire string being looked up. Depending on the application, that string is an entire client hostname, an entire client IP address, or an -entire mail address. +entire mail address. Patterns are applied in order as specified, +until a pattern is found that matches the search string. -In contrast to the normal lookups from indexed files, no parent -domain or network search is done, and \fIuser@domain\fR mail -addresses are not broken up into their \fIuser@\fR and \fIdomain\fR -constituent parts. +In contrast to lookups from indexed files, no parent domain or +parent network search is done with regular expression tables, +and \fIuser@domain\fR mail addresses are not broken up into their +\fIuser@\fR and \fIdomain\fR constituent parts. Actions are the same as with normal indexed file lookups, with the additional feature that parenthesized substrings from the diff --git a/postfix/man/man8/local.8 b/postfix/man/man8/local.8 index 29a3c3b26..da7665d53 100644 --- a/postfix/man/man8/local.8 +++ b/postfix/man/man8/local.8 @@ -232,7 +232,7 @@ or to the alias \fIname\fR, to the destinations listed in to the mailbox owned by the user \fIname\fR, or it is sent back as undeliverable. -In all cases the \fBlocal\fR daemon prepends an opional +In all cases the \fBlocal\fR daemon prepends an optional `\fBDelivered-To:\fR \fIname\fR+\fIfoo\fR' header line. .SH DELIVERY RIGHTS .na