snapshot-20000203

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

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:
 ===========================================

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)
 {

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.
      */

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
+#	In contrast to lookups from indexed files, no parent domain or
-#	domain or network search is done, and \fIuser@domain\fR mail
+#	parent network search is done with regular expression tables, 
-#	addresses are not broken up into their \fIuser@\fR and \fIdomain\fR
+#	and \fIuser@domain\fR mail addresses are not broken up into their 
-#	constituent parts.
+#	\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

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
+#define BOUNCE_CMD_WARN		2	/* send warning bounce, don't delete log */
-					 * log */
 #define BOUNCE_CMD_RECIP	3	/* immediate bounce, no logfile */
 
  /*

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;
 /*

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

postfix/html/access.5.html

@@ -100,15 +100,17 @@ ACCESS(5)                                               ACCESS(5)
        a description of regular expression lookup  table  syntax,
        see <b>regexp</b><i>_</i><b>table</b>(5) or <b>pcre</b><i>_</i><b>table</b>(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
+       In contrast to  lookups  from  indexed  files,  no  parent
-       parent  domain  or network search is done, and <i>user@domain</i>
+       domain  or  parent  network  search  is  done with regular
-       mail addresses are not broken  up  into  their  <i>user@</i>  and
+       expression tables, and <i>user@domain</i> mail addresses are  not
-       <i>domain</i> constituent parts.
+       broken up into their <i>user@</i> and <i>domain</i> 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)
 <b>SEE</b> <b>ALSO</b>
        <a href="postmap.1.html">postmap(1)</a> create mapping table
        <a href="smtpd.8.html">smtpd(8)</a> smtp server
-       pcre_table(5) format of PCRE tables
+       <a href="pcre_table.5.html">pcre_table(5)</a> format of PCRE tables
-       regexp_table(5) format of POSIX regexp tables
+       <a href="regexp_table.5.html">regexp_table(5)</a> format of POSIX regexp tables
 
-<b>LICENSE</b>
-       The  Secure  Mailer  license must be distributed with this
 
 
 
@@ -137,6 +137,8 @@ ACCESS(5)                                               ACCESS(5)
 ACCESS(5)                                               ACCESS(5)
 
 
+<b>LICENSE</b>
+       The  Secure  Mailer  license must be distributed with this
        software.
 
 <b>AUTHOR(S)</b>
@@ -189,8 +191,6 @@ ACCESS(5)                                               ACCESS(5)
 
 
 
-
-
 
 
 

postfix/html/faq.html

@@ -1289,7 +1289,7 @@ in <b>/etc/postfix/master.cf</b>, specify:
 
 <pre>
     /etc/postfix/main.cf:
-        local_recipient_maps = $relocated_maps $alias_maps, unix:passwd.byname
+        local_recipient_maps = $alias_maps, unix:passwd.byname
 </pre>
 
 <p>

postfix/html/local.8.html

@@ -252,7 +252,7 @@ LOCAL(8)                                                 LOCAL(8)
        <b>ward</b>+<i>foo</i> or in ~<i>name</i>/.<b>forward</b>, to the mailbox owned by the
        user <i>name</i>, or it is sent back as undeliverable.
 
-       In all cases the <b>local</b> daemon prepends an opional  `<b>Deliv-</b>
+       In all cases the <b>local</b> daemon prepends an optional `<b>Deliv-</b>
        <b>ered-To:</b> <i>name</i>+<i>foo</i>' header line.
 
 <b>DELIVERY</b> <b>RIGHTS</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

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
+In contrast to lookups from indexed files, no parent domain or
-domain or network search is done, and \fIuser@domain\fR mail
+parent network search is done with regular expression tables,
-addresses are not broken up into their \fIuser@\fR and \fIdomain\fR
+and \fIuser@domain\fR mail addresses are not broken up into their
-constituent parts.
+\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

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