From: Wietse Venema Date: Tue, 21 Nov 2000 05:00:00 +0000 (-0500) Subject: snapshot-20001121 X-Git-Tag: v20010228~20 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1234654100a817e1d37470f4fb25da895378b441;p=thirdparty%2Fpostfix.git snapshot-20001121 --- diff --git a/postfix/HISTORY b/postfix/HISTORY index cc90d46a7..f54f46ded 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -4516,3 +4516,9 @@ Apologies for any names omitted. that specify the width of %*letter conversions. On some systems, sizeof and pointer difference expressions are wider than an int. Reported by Valentin Nechayev @ lucky.net. + +20001121: + + Compatibility: Postfix now retries delivery when an external + command is killed by a signal, because people expect such + behavior from Sendmail. File: global/pipe_command.c. diff --git a/postfix/LMTP_README b/postfix/LMTP_README index 33ab63198..873c6c3d1 100644 --- a/postfix/LMTP_README +++ b/postfix/LMTP_README @@ -1,3 +1,35 @@ +BEGIN WARNING +============= + +The information in this file is outdated. The Postfix LMTP server +can now make connections over UNIX-domain sockets. + +With connections over TCP sockets, some Cyrus implementations insist +on SASL-style authentication, which is not supported by the Postfix +LMTP client. In that case, use UNIX-domain sockets instead. + +The precise syntax for UNIX-domain and TCP connection endpoints is +given in the lmtp(8) manual page. + +Examples: + + /etc/postfix/transport: + domain1.name lmtp1:unix:/path/name + domain2.name lmtp2:lmtp2host + + /etc/postfix/master.cf: + lmtp1 unix - - n - - lmtp + lmtp2 unix - - n - - lmtp + +The first example (domain1) uses UNIX-domain connections, the second +example (domain2) uses TCP. + +For optimal use of connection caching, specify separate mail delivery +transports for each domain that receives mail via LMTP: + +END WARNING +=========== + Postfix LMTP support ==================== diff --git a/postfix/PORTING b/postfix/PORTING index 46df4486f..2a494420b 100644 --- a/postfix/PORTING +++ b/postfix/PORTING @@ -15,9 +15,10 @@ native flavor, not the emulated one. - Add an #ifdef SYSTEMTYPE section to the central util/sys_defs.h include file. You may have to invent new feature macros. Please choose sensible feature macro names such as HAS_DBM or -FIONREAD_IN_SYS_FILIO_H. I strongly recommend against #ifdef -SYSTEMTYPE dependencies in individual source files. This may seem -to be the quickest solution, but it will create a mess that becomes -increasingly difficult to maintain over time. Moreover, with the -next port you'd have to place #ifdefs all over the source code -again. +FIONREAD_IN_SYS_FILIO_H. + +I strongly object to #ifdef SYSTEMTYPE dependencies in individual +source files. This may seem to be the quickest solution, but it +will create a mess that becomes increasingly difficult to maintain +over time. Moreover, with the next port to another system you'd +have to place #ifdefs all over the source code again. diff --git a/postfix/RELEASE_NOTES b/postfix/RELEASE_NOTES index 2b077fba0..3ee7d1a1a 100644 --- a/postfix/RELEASE_NOTES +++ b/postfix/RELEASE_NOTES @@ -1,23 +1,35 @@ -Incompatible changes with snapshot-20001120 +Incompatible changes with snapshot-20001121 =========================================== -On RedHat Linux 7.0, you must install the db3-devel RPM before you -can compile the Postfix source code. +If this release does not work for you, you can go back to a previous +Postfix version without losing your mail, subject to the "incompatible +changes" listed for previous Postfix releases below. -Major changes with snapshot-20001120 +Major changes with snapshot-20001121 ==================================== -The mailbox_transport feature works again. +Support for RedHat Linux 7.0. On RedHat Linux 7.0, you must install +the db3-devel RPM before you can compile the Postfix source code. + +The mailbox_transport feature works again. It was broken when the +"require_home_directory" feature was added. + +More general virtual domain support. Postfix now supports both +Sendmail-style virtual domains and Postfix-style virtual domains. +Details and examples are given in the revised virtual manual page. + +- With Sendmail-style virtual domains, local users/aliases/mailing + lists are visible as localname@virtual.domain. This is convenient + if you want to host mailing lists under virtual domains. -Postfix now supports both Sendmail-style virtual domains (all local -users and aliases are visible in all virtual domains) and Postfix-style -virtual domains (local users and aliases are not visible in virtual -domains). Details and examples are given in the revised virtual -manual page. +- With Postfix-style virtual domains, local users/aliases/mailing + lists are not visible as localname@virtual.domain. Each virtual + domain has its own separate name space. -The soft bounce feature now includes the Postfix SMTP server. -Specify "soft_bounce = yes" in main.cf to prevent the SMTP server -from bouncing mail while you are testing configurations. +More general "soft bounce" feature. Specify "soft_bounce = yes" +in main.cf to prevent the SMTP server from bouncing mail while you +are testing configurations. Until this release the SMTP server was +not aware of soft bounces. Incompatible changes with snapshot-20001029 =========================================== diff --git a/postfix/conf/virtual b/postfix/conf/virtual index 25a4a6928..d0a3d7b8a 100644 --- a/postfix/conf/virtual +++ b/postfix/conf/virtual @@ -40,11 +40,11 @@ # has its own user name space. Local (i.e. non-virtual) # usernames are not visible in a Postfix-style virtual # domain. In particular, local aliases(5) and mailing lists -# are not visible in a Postfix-style virtual domain. +# are not visible as localname@virtual.domain. # # Use a Sendmail-style virtual domain (see below) if local # usernames, aliases(5) or mailing lists should be visible -# in that virtual domain. +# as localname@virtual.domain. # # Support for a Postfix-style virtual domain looks like: # @@ -75,11 +75,11 @@ # With a Sendmail-style virtual domain, every local (i.e. # non-virtual) username is visible in the virtual domain. In # particular, every local alias and mailing list is visible -# in a Sendmail-style virtual domain. +# as localname@virtual.domain. # # Use a Postfix-style virtual domain (see above) if local # usernames, aliases(5) or mailing lists should not be visi- -# ble in that virtual domain. +# ble as localname@virtual.domain. # # Support for a Sendmail-style virtual domain looks like: # diff --git a/postfix/html/virtual.5.html b/postfix/html/virtual.5.html index 4822791f6..720d763b6 100644 --- a/postfix/html/virtual.5.html +++ b/postfix/html/virtual.5.html @@ -44,11 +44,11 @@ VIRTUAL(5) VIRTUAL(5) has its own user name space. Local (i.e. non-virtual) usernames are not visible in a Postfix-style virtual domain. In particular, local aliases(5) and mailing lists - are not visible in a Postfix-style virtual domain. + are not visible as localname@virtual.domain. Use a Sendmail-style virtual domain (see below) if local usernames, aliases(5) or mailing lists should be visible - in that virtual domain. + as localname@virtual.domain. Support for a Postfix-style virtual domain looks like: @@ -86,11 +86,11 @@ VIRTUAL(5) VIRTUAL(5) With a Sendmail-style virtual domain, every local (i.e. non-virtual) username is visible in the virtual domain. In particular, every local alias and mailing list is visible - in a Sendmail-style virtual domain. + as localname@virtual.domain. Use a Postfix-style virtual domain (see above) if local usernames, aliases(5) or mailing lists should not be visi- - ble in that virtual domain. + ble as localname@virtual.domain. Support for a Sendmail-style virtual domain looks like: diff --git a/postfix/man/man5/virtual.5 b/postfix/man/man5/virtual.5 index 96747ab60..ef75b179d 100644 --- a/postfix/man/man5/virtual.5 +++ b/postfix/man/man5/virtual.5 @@ -42,12 +42,12 @@ the lookups are done in a slightly different way as described below. With a Postfix-style virtual domain, the virtual domain has its own user name space. Local (i.e. non-virtual) usernames are not visible in a Postfix-style virtual domain. In particular, local -\fBaliases\fR(5) and mailing lists are not visible in a -Postfix-style virtual domain. +\fBaliases\fR(5) and mailing lists are not visible as +\fIlocalname@virtual.domain\fR. Use a Sendmail-style virtual domain (see below) if local usernames, -\fBaliases\fR(5) or mailing lists should be visible in that virtual -domain. +\fBaliases\fR(5) or mailing lists should be visible as +\fIlocalname@virtual.domain\fR. Support for a Postfix-style virtual domain looks like: .sp @@ -77,13 +77,12 @@ mail for \fIunknown-user\fR@\fIvirtual.domain\fR as undeliverable. .ad .fi With a Sendmail-style virtual domain, every local (i.e. non-virtual) -username is visible in the virtual domain. In particular, every -local alias and mailing list is visible in a Sendmail-style virtual -domain. +username is visible in the virtual domain. In particular, every local +alias and mailing list is visible as \fIlocalname@virtual.domain\fR. Use a Postfix-style virtual domain (see above) if local usernames, -\fBaliases\fR(5) or mailing lists should not be visible in that -virtual domain. +\fBaliases\fR(5) or mailing lists should not be visible as +\fIlocalname@virtual.domain\fR. Support for a Sendmail-style virtual domain looks like: .sp diff --git a/postfix/proto/virtual b/postfix/proto/virtual index ed0451535..a42646c7e 100644 --- a/postfix/proto/virtual +++ b/postfix/proto/virtual @@ -34,12 +34,12 @@ # With a Postfix-style virtual domain, the virtual domain has its # own user name space. Local (i.e. non-virtual) usernames are not # visible in a Postfix-style virtual domain. In particular, local -# \fBaliases\fR(5) and mailing lists are not visible in a -# Postfix-style virtual domain. +# \fBaliases\fR(5) and mailing lists are not visible as +# \fIlocalname@virtual.domain\fR. # # Use a Sendmail-style virtual domain (see below) if local usernames, -# \fBaliases\fR(5) or mailing lists should be visible in that virtual -# domain. +# \fBaliases\fR(5) or mailing lists should be visible as +# \fIlocalname@virtual.domain\fR. # # Support for a Postfix-style virtual domain looks like: # .sp @@ -67,13 +67,12 @@ # .ad # .fi # With a Sendmail-style virtual domain, every local (i.e. non-virtual) -# username is visible in the virtual domain. In particular, every -# local alias and mailing list is visible in a Sendmail-style virtual -# domain. +# username is visible in the virtual domain. In particular, every local +# alias and mailing list is visible as \fIlocalname@virtual.domain\fR. # # Use a Postfix-style virtual domain (see above) if local usernames, -# \fBaliases\fR(5) or mailing lists should not be visible in that -# virtual domain. +# \fBaliases\fR(5) or mailing lists should not be visible as +# \fIlocalname@virtual.domain\fR. # # Support for a Sendmail-style virtual domain looks like: # .sp diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h index 68fe73b56..852072839 100644 --- a/postfix/src/global/mail_version.h +++ b/postfix/src/global/mail_version.h @@ -15,7 +15,7 @@ * Version of this program. */ #define VAR_MAIL_VERSION "mail_version" -#define DEF_MAIL_VERSION "Snapshot-20001120" +#define DEF_MAIL_VERSION "Snapshot-20001121" extern char *var_mail_version; /* LICENSE diff --git a/postfix/src/global/pipe_command.c b/postfix/src/global/pipe_command.c index a816ef956..b86da9cad 100644 --- a/postfix/src/global/pipe_command.c +++ b/postfix/src/global/pipe_command.c @@ -486,7 +486,7 @@ int pipe_command(VSTREAM *src, VSTRING *why,...) WTERMSIG(wait_status), args.command, log_len ? ". Command output: " : "", log_buf); - return (PIPE_STAT_BOUNCE); + return (PIPE_STAT_DEFER); } else if (SYS_EXITS_CODE(WEXITSTATUS(wait_status))) { vstring_sprintf(why, "%s%s%s", sys_exits_strerror(WEXITSTATUS(wait_status)), diff --git a/postfix/src/smtpd/smtpd_check.c b/postfix/src/smtpd/smtpd_check.c index cba8d8181..3d8c0e130 100644 --- a/postfix/src/smtpd/smtpd_check.c +++ b/postfix/src/smtpd/smtpd_check.c @@ -1979,8 +1979,7 @@ char *smtpd_check_rcptmap(SMTPD_STATE *state, char *recipient) * Sendmail-style virtual domains. */ if (*var_local_rcpt_maps && resolve_local(domain)) { - if (NOMATCH(relocated_maps, STR(reply.recipient)) - && NOMATCH(rcpt_canon_maps, STR(reply.recipient)) + if (NOMATCH(rcpt_canon_maps, STR(reply.recipient)) && NOMATCH(canonical_maps, STR(reply.recipient)) && NOMATCH(relocated_maps, STR(reply.recipient)) && NOMATCH(virtual_maps, STR(reply.recipient))