From 84cb6f3b49d8a0c08a130886c8b88385d83f8432 Mon Sep 17 00:00:00 2001 From: Wietse Venema Date: Mon, 8 May 2023 00:00:00 -0500 Subject: [PATCH] postfix-3.9-20230508 --- postfix/HISTORY | 7 ++++ postfix/README_FILES/ADDRESS_REWRITING_README | 12 +++--- postfix/conf/virtual | 12 +++--- postfix/html/ADDRESS_REWRITING_README.html | 11 ++--- postfix/html/cleanup.8.html | 6 +-- postfix/html/local.8.html | 4 +- postfix/html/postconf.5.html | 41 +++++++++++-------- postfix/html/smtpd.8.html | 6 +-- postfix/html/virtual.5.html | 12 +++--- postfix/man/man5/postconf.5 | 39 ++++++++++-------- postfix/man/man5/virtual.5 | 14 +++---- postfix/man/man8/cleanup.8 | 6 +-- postfix/man/man8/local.8 | 4 +- postfix/man/man8/smtpd.8 | 10 ++--- postfix/proto/ADDRESS_REWRITING_README.html | 11 ++--- postfix/proto/postconf.proto | 41 +++++++++++-------- postfix/proto/virtual | 14 +++---- postfix/src/cleanup/cleanup.c | 6 +-- postfix/src/global/mail_version.h | 2 +- postfix/src/local/local.c | 4 +- postfix/src/smtpd/smtpd.c | 10 ++--- 21 files changed, 148 insertions(+), 124 deletions(-) diff --git a/postfix/HISTORY b/postfix/HISTORY index f7c730fc7..6948b8a2b 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -27150,3 +27150,10 @@ Apologies for any names omitted. Documentation: fine tuning of text about local aliasing versus virtual aliasing. Files: proto/postconf.proto, proto/aliases, proto/virtual, proto/ADDRESS_REWRITING_README.html. + +20230508 + + Documentation: more fine tuning of text about local aliasing + versus virtual aliasing, and inet_interfaces. Files: + proto/postconf.proto, proto/aliases, proto/virtual, + proto/ADDRESS_REWRITING_README.html. diff --git a/postfix/README_FILES/ADDRESS_REWRITING_README b/postfix/README_FILES/ADDRESS_REWRITING_README index 6ffa3b643..4c2428762 100644 --- a/postfix/README_FILES/ADDRESS_REWRITING_README +++ b/postfix/README_FILES/ADDRESS_REWRITING_README @@ -489,9 +489,9 @@ transform " Firstname.Lastname " back into UNIX login names, although it seems that local aliases may be a more appropriate vehicle. See the VIRTUAL_README document for an overview of methods to host virtual domains with Postfix. -Note: virtual aliasing (virtual_alias_maps) applies to all email deliveries: -local(8), virtual, and remote. This is unlike local aliasing (alias_maps) which -applies only to local(8) delivery. +Note: virtual aliasing (virtual_alias_maps) applies to all recipients: local +(8), virtual, and remote. This is unlike local aliasing (alias_maps) which +applies only to local(8) recipients. Virtual aliasing is disabled by default. To enable, edit the virtual_alias_maps parameter in the main.cf file and specify one or more lookup tables, separated @@ -707,9 +707,9 @@ implement distribution lists, or to direct mail for standard aliases such as postmaster to real people. The table can also be used to map "Firstname.Lastname" addresses to login names. -Note: local aliasing (alias_maps) applies only to local(8) delivery. This is -unlike virtual aliasing (virtual_alias_maps) which applies to all email -deliveries: local(8), virtual, and remote. +Note: local aliasing (alias_maps) applies only to local(8) recipients. This is +unlike virtual aliasing (virtual_alias_maps) which applies to all recipients: +local(8), virtual, and remote. Alias lookups are enabled by default. The default configuration depends on the operating system environment, but it is typically one of the following: diff --git a/postfix/conf/virtual b/postfix/conf/virtual index 2a764c4d0..8200ca49b 100644 --- a/postfix/conf/virtual +++ b/postfix/conf/virtual @@ -12,12 +12,12 @@ # # DESCRIPTION # The optional virtual(5) alias table (virtual_alias_maps) -# rewrites all recipients: local(8), virtual, and remote. +# applies to all recipients: local(8), virtual, and remote. # This feature is implemented in the Postfix cleanup(8) dae- # mon before mail is queued. # -# This is unlike the aliases(5) table (alias_maps) which is -# used only for local(8) delivery. +# This is unlike the aliases(5) table (alias_maps) which +# applies only to local(8) recipients. # # Virtual aliasing is recursive; to terminate recursion for # a specific address, alias that address to itself. @@ -257,9 +257,9 @@ # # virtual_alias_maps ($virtual_maps) # Optional lookup tables with aliases that apply to -# all email deliveries: local(8), virtual, and -# remote, unlike alias_maps that apply only to -# local(8) delivery. +# all recipients: local(8), virtual, and remote; this +# is unlike alias_maps that apply only to local(8) +# recipients. # # virtual_alias_domains ($virtual_alias_maps) # Postfix is the final destination for the specified diff --git a/postfix/html/ADDRESS_REWRITING_README.html b/postfix/html/ADDRESS_REWRITING_README.html index 6377f3c60..c92a314bd 100644 --- a/postfix/html/ADDRESS_REWRITING_README.html +++ b/postfix/html/ADDRESS_REWRITING_README.html @@ -771,9 +771,10 @@ may be a more appropriate vehicle. See the VIRTUAL for an overview of methods to host virtual domains with Postfix.

-

Note: virtual aliasing (virtual_alias_maps) applies to all email -deliveries: local(8), virtual, and remote. This is unlike local -aliasing (alias_maps) which applies only to local(8) delivery.

+

Note: virtual aliasing (virtual_alias_maps) applies to all +recipients: local(8), virtual, and remote. +This is unlike local aliasing (alias_maps) which applies only to +local(8) recipients.

Virtual aliasing is disabled by default. To enable, edit the virtual_alias_maps parameter in the main.cf file and @@ -1061,8 +1062,8 @@ The table can also be used to map "Firstname.Lastname" addresses to login names.

Note: local aliasing (alias_maps) applies only to local(8) -delivery. This is unlike virtual aliasing (virtual_alias_maps) -which applies to all email deliveries: local(8), virtual, and remote. +recipients. This is unlike virtual aliasing (virtual_alias_maps) +which applies to all recipients: local(8), virtual, and remote.

Alias lookups are enabled by default. The default configuration diff --git a/postfix/html/cleanup.8.html b/postfix/html/cleanup.8.html index 05f32cd4e..6ee8804e4 100644 --- a/postfix/html/cleanup.8.html +++ b/postfix/html/cleanup.8.html @@ -343,9 +343,9 @@ CLEANUP(8) CLEANUP(8) Available in Postfix version 2.0 and later: virtual_alias_maps ($virtual_maps) - Optional lookup tables with aliases that apply to all email - deliveries: local(8), virtual, and remote, unlike alias_maps - that apply only to local(8) delivery. + Optional lookup tables with aliases that apply to all recipi- + ents: local(8), virtual, and remote; this is unlike alias_maps + that apply only to local(8) recipients. Available in Postfix version 2.2 and later: diff --git a/postfix/html/local.8.html b/postfix/html/local.8.html index 4c3d4a9f9..2c80b0e67 100644 --- a/postfix/html/local.8.html +++ b/postfix/html/local.8.html @@ -383,8 +383,8 @@ LOCAL(8) LOCAL(8) alias_maps (see 'postconf -d' output) Optional lookup tables with aliases that apply only to local(8) - delivery, unlike virtual_alias_maps that apply to all email - deliveries: local(8), virtual, and remote. + recipients; this is unlike virtual_alias_maps that apply to all + recipients: local(8), virtual, and remote. forward_path (see 'postconf -d' output) The local(8) delivery agent search list for finding a .forward diff --git a/postfix/html/postconf.5.html b/postfix/html/postconf.5.html index af20b7679..4426f727b 100644 --- a/postfix/html/postconf.5.html +++ b/postfix/html/postconf.5.html @@ -613,8 +613,8 @@ Examples:

Optional lookup tables with aliases that apply only to local(8) -delivery, unlike virtual_alias_maps that apply to all email deliveries: -local(8), virtual, and remote. +recipients; this is unlike virtual_alias_maps that apply to all +recipients: local(8), virtual, and remote. The table format and lookups are documented in aliases(5). For an overview of Postfix address manipulations see the ADDRESS_REWRITING_README document.

@@ -4134,14 +4134,17 @@ Specify 0 to disable the feature. Valid delays are 0..10.
inet_interfaces (default: all)
-

The local network interface addresses that this mail system receives -mail on. Specify "all" to receive mail on all network -interfaces (default), and "loopback-only" to receive mail -on loopback network interfaces only (Postfix version 2.2 and later). The -parameter also controls delivery of mail to user@[ip.address]. -Specify an empty value if Postfix does not receive mail over the network, -or if all network listeners have an explicit IP address in master.cf. -

+

The local network interface addresses that this mail system +receives mail on. Specify "all" to receive mail on all network +interfaces (default), "loopback-only" to receive mail on loopback +network interfaces only (Postfix version 2.2 and later), or zero +or more IPv4 or IPv6 addresses (IPv6 is supported in Postfix version +2.2 and later). The parameter also controls whether Postfix will +accept mail for user@[ip.address], and prevents Postfix +from delivering mail to a host that has equal or larger MX preference. +Specify an empty value if Postfix does not receive mail over the +network, or if all network listeners have an explicit IP address +in master.cf.

Note 1: you need to stop and start Postfix when this parameter changes. @@ -4152,7 +4155,13 @@ but this form is not required here.

When smtp_bind_address and/or smtp_bind_address6 are not specified, the inet_interfaces setting may constrain the source IP -address for an outbound SMTP or LMTP connection.

+address for an outbound SMTP or LMTP connection as described below. +

+ +

The following text is specific to SMTP and IPv4. The same +reasoning applies to the IPv6 protocol, and to the Postfix LMTP +client. To disable IPv4 or IPv6 support in the Postfix SMTP and +LMTP client, use inet_protocols.

A Postfix SMTP client may fail to reach some remote SMTP servers @@ -21620,9 +21625,9 @@ This feature is available in Postfix 2.1 and later. (default: $virtual_maps)

-Optional lookup tables with aliases that apply to all email deliveries: -local(8), virtual, and remote, unlike alias_maps that apply only -to local(8) delivery. +Optional lookup tables with aliases that apply to all recipients: +local(8), virtual, and remote; this is unlike alias_maps that apply +only to local(8) recipients. The table format and lookups are documented in virtual(5). For an overview of Postfix address manipulations see the ADDRESS_REWRITING_README document. diff --git a/postfix/html/smtpd.8.html b/postfix/html/smtpd.8.html index 87fa7e115..b8a03a0a3 100644 --- a/postfix/html/smtpd.8.html +++ b/postfix/html/smtpd.8.html @@ -831,9 +831,9 @@ SMTPD(8) SMTPD(8) aliased to addresses in other local or remote domains. virtual_alias_maps ($virtual_maps) - Optional lookup tables with aliases that apply to all email - deliveries: local(8), virtual, and remote, unlike alias_maps - that apply only to local(8) delivery. + Optional lookup tables with aliases that apply to all recipi- + ents: local(8), virtual, and remote; this is unlike alias_maps + that apply only to local(8) recipients. unknown_virtual_alias_reject_code (550) The Postfix SMTP server reply code when a recipient address diff --git a/postfix/html/virtual.5.html b/postfix/html/virtual.5.html index 35a82f91c..c1c6eceaf 100644 --- a/postfix/html/virtual.5.html +++ b/postfix/html/virtual.5.html @@ -18,12 +18,12 @@ VIRTUAL(5) VIRTUAL(5) postmap -q - /etc/postfix/virtual <inputfile DESCRIPTION - The optional virtual(5) alias table (virtual_alias_maps) rewrites all + The optional virtual(5) alias table (virtual_alias_maps) applies to all recipients: local(8), virtual, and remote. This feature is implemented in the Postfix cleanup(8) daemon before mail is queued. - This is unlike the aliases(5) table (alias_maps) which is used only for - local(8) delivery. + This is unlike the aliases(5) table (alias_maps) which applies only to + local(8) recipients. Virtual aliasing is recursive; to terminate recursion for a specific address, alias that address to itself. @@ -231,9 +231,9 @@ VIRTUAL(5) VIRTUAL(5) Use the "postfix reload" command after a configuration change. virtual_alias_maps ($virtual_maps) - Optional lookup tables with aliases that apply to all email - deliveries: local(8), virtual, and remote, unlike alias_maps - that apply only to local(8) delivery. + Optional lookup tables with aliases that apply to all recipi- + ents: local(8), virtual, and remote; this is unlike alias_maps + that apply only to local(8) recipients. virtual_alias_domains ($virtual_alias_maps) Postfix is the final destination for the specified list of vir- diff --git a/postfix/man/man5/postconf.5 b/postfix/man/man5/postconf.5 index 282f9a1d8..bc0822bc0 100644 --- a/postfix/man/man5/postconf.5 +++ b/postfix/man/man5/postconf.5 @@ -359,8 +359,8 @@ alias_database = hash:/etc/mail/aliases .ft R .SH alias_maps (default: see "postconf \-d" output) Optional lookup tables with aliases that apply only to \fBlocal\fR(8) -delivery, unlike virtual_alias_maps that apply to all email deliveries: -\fBlocal\fR(8), virtual, and remote. +recipients; this is unlike virtual_alias_maps that apply to all +recipients: \fBlocal\fR(8), virtual, and remote. The table format and lookups are documented in \fBaliases\fR(5). For an overview of Postfix address manipulations see the ADDRESS_REWRITING_README document. @@ -2613,13 +2613,17 @@ number of messages delivered per second. .PP Specify 0 to disable the feature. Valid delays are 0..10. .SH inet_interfaces (default: all) -The local network interface addresses that this mail system receives -mail on. Specify "all" to receive mail on all network -interfaces (default), and "loopback\-only" to receive mail -on loopback network interfaces only (Postfix version 2.2 and later). The -parameter also controls delivery of mail to user@[ip.address]. -Specify an empty value if Postfix does not receive mail over the network, -or if all network listeners have an explicit IP address in master.cf. +The local network interface addresses that this mail system +receives mail on. Specify "all" to receive mail on all network +interfaces (default), "loopback\-only" to receive mail on loopback +network interfaces only (Postfix version 2.2 and later), or zero +or more IPv4 or IPv6 addresses (IPv6 is supported in Postfix version +2.2 and later). The parameter also controls whether Postfix will +accept mail for user@[ip.address], and prevents Postfix +from delivering mail to a host that has equal or larger MX preference. +Specify an empty value if Postfix does not receive mail over the +network, or if all network listeners have an explicit IP address +in master.cf. .PP Note 1: you need to stop and start Postfix when this parameter changes. .PP @@ -2628,7 +2632,12 @@ but this form is not required here. .PP When smtp_bind_address and/or smtp_bind_address6 are not specified, the inet_interfaces setting may constrain the source IP -address for an outbound SMTP or LMTP connection. +address for an outbound SMTP or LMTP connection as described below. +.PP +The following text is specific to SMTP and IPv4. The same +reasoning applies to the IPv6 protocol, and to the Postfix LMTP +client. To disable IPv4 or IPv6 support in the Postfix SMTP and +LMTP client, use inet_protocols. .IP \(bu When inet_interfaces specifies one IPv4 address, and that is not a loopback address, the Postfix SMTP client uses that as the @@ -2640,10 +2649,6 @@ address. This includes the cases where inet_interfaces is empty, where it specifies \fBall\fR, or where it contains no IPv4 address, one IPv4 address that is a loopback address, or multiple IPv4 addresses. -.IP \(bu -The same reasoning as above applies to the IPv6 protocol, -and to the Postfix LMTP client. To disable IPv4 or IPv6 support in -the Postfix SMTP and LMTP client, use inet_protocols. .br .PP A Postfix SMTP client may fail to reach some remote SMTP servers @@ -15229,9 +15234,9 @@ from each original recipient. .PP This feature is available in Postfix 2.1 and later. .SH virtual_alias_maps (default: $virtual_maps) -Optional lookup tables with aliases that apply to all email deliveries: -\fBlocal\fR(8), virtual, and remote, unlike alias_maps that apply only -to \fBlocal\fR(8) delivery. +Optional lookup tables with aliases that apply to all recipients: +\fBlocal\fR(8), virtual, and remote; this is unlike alias_maps that apply +only to \fBlocal\fR(8) recipients. The table format and lookups are documented in \fBvirtual\fR(5). For an overview of Postfix address manipulations see the ADDRESS_REWRITING_README document. diff --git a/postfix/man/man5/virtual.5 b/postfix/man/man5/virtual.5 index d7c08f00e..e03a50008 100644 --- a/postfix/man/man5/virtual.5 +++ b/postfix/man/man5/virtual.5 @@ -17,12 +17,12 @@ Postfix virtual alias table format .ad .fi The optional \fBvirtual\fR(5) alias table (virtual_alias_maps) -rewrites all recipients: local(8), virtual, and remote. +applies to all recipients: local(8), virtual, and remote. This feature is implemented in the Postfix \fBcleanup\fR(8) daemon before mail is queued. This is unlike the \fBaliases\fR(5) table (alias_maps) which -is used only for \fBlocal\fR(8) delivery. +applies only to \fBlocal\fR(8) recipients. Virtual aliasing is recursive; to terminate recursion for a specific address, alias that address to itself. @@ -271,9 +271,9 @@ this topic. See the Postfix \fBmain.cf\fR file for syntax details and for default values. Use the "\fBpostfix reload\fR" command after a configuration change. .IP "\fBvirtual_alias_maps ($virtual_maps)\fR" -Optional lookup tables with aliases that apply to all email deliveries: -\fBlocal\fR(8), virtual, and remote, unlike alias_maps that apply only -to \fBlocal\fR(8) delivery. +Optional lookup tables with aliases that apply to all recipients: +\fBlocal\fR(8), virtual, and remote; this is unlike alias_maps that apply +only to \fBlocal\fR(8) recipients. .IP "\fBvirtual_alias_domains ($virtual_alias_maps)\fR" Postfix is the final destination for the specified list of virtual alias domains, that is, domains for which all addresses are aliased @@ -284,8 +284,8 @@ key to the lookup result. .PP Other parameters of interest: .IP "\fBinet_interfaces (all)\fR" -The local network interface addresses that this mail system receives -mail on. +The local network interface addresses that this mail system +receives mail on. .IP "\fBmydestination ($myhostname, localhost.$mydomain, localhost)\fR" The list of domains that are delivered via the $local_transport mail delivery transport. diff --git a/postfix/man/man8/cleanup.8 b/postfix/man/man8/cleanup.8 index 253c142b0..a6bec00c0 100644 --- a/postfix/man/man8/cleanup.8 +++ b/postfix/man/man8/cleanup.8 @@ -321,9 +321,9 @@ remote domains. .PP Available in Postfix version 2.0 and later: .IP "\fBvirtual_alias_maps ($virtual_maps)\fR" -Optional lookup tables with aliases that apply to all email deliveries: -\fBlocal\fR(8), virtual, and remote, unlike alias_maps that apply only -to \fBlocal\fR(8) delivery. +Optional lookup tables with aliases that apply to all recipients: +\fBlocal\fR(8), virtual, and remote; this is unlike alias_maps that apply +only to \fBlocal\fR(8) recipients. .PP Available in Postfix version 2.2 and later: .IP "\fBcanonical_classes (envelope_sender, envelope_recipient, header_sender, header_recipient)\fR" diff --git a/postfix/man/man8/local.8 b/postfix/man/man8/local.8 index 91bceea3e..7bba0300b 100644 --- a/postfix/man/man8/local.8 +++ b/postfix/man/man8/local.8 @@ -450,8 +450,8 @@ home_mailbox, mail_spool_directory, fallback_transport_maps, fallback_transport, and luser_relay. .IP "\fBalias_maps (see 'postconf -d' output)\fR" Optional lookup tables with aliases that apply only to \fBlocal\fR(8) -delivery, unlike virtual_alias_maps that apply to all email deliveries: -\fBlocal\fR(8), virtual, and remote. +recipients; this is unlike virtual_alias_maps that apply to all +recipients: \fBlocal\fR(8), virtual, and remote. .IP "\fBforward_path (see 'postconf -d' output)\fR" The \fBlocal\fR(8) delivery agent search list for finding a .forward file with user\-specified delivery methods. diff --git a/postfix/man/man8/smtpd.8 b/postfix/man/man8/smtpd.8 index e7c239114..ea070e1ef 100644 --- a/postfix/man/man8/smtpd.8 +++ b/postfix/man/man8/smtpd.8 @@ -699,8 +699,8 @@ Parameters concerning known/unknown local recipients: The list of domains that are delivered via the $local_transport mail delivery transport. .IP "\fBinet_interfaces (all)\fR" -The local network interface addresses that this mail system receives -mail on. +The local network interface addresses that this mail system +receives mail on. .IP "\fBproxy_interfaces (empty)\fR" The remote network interface addresses that this mail system receives mail on by way of a proxy or network address translation unit. @@ -735,9 +735,9 @@ Postfix is the final destination for the specified list of virtual alias domains, that is, domains for which all addresses are aliased to addresses in other local or remote domains. .IP "\fBvirtual_alias_maps ($virtual_maps)\fR" -Optional lookup tables with aliases that apply to all email deliveries: -\fBlocal\fR(8), virtual, and remote, unlike alias_maps that apply only -to \fBlocal\fR(8) delivery. +Optional lookup tables with aliases that apply to all recipients: +\fBlocal\fR(8), virtual, and remote; this is unlike alias_maps that apply +only to \fBlocal\fR(8) recipients. .IP "\fBunknown_virtual_alias_reject_code (550)\fR" The Postfix SMTP server reply code when a recipient address matches $virtual_alias_domains, and $virtual_alias_maps specifies a list diff --git a/postfix/proto/ADDRESS_REWRITING_README.html b/postfix/proto/ADDRESS_REWRITING_README.html index eaeb24973..631a7d3c6 100644 --- a/postfix/proto/ADDRESS_REWRITING_README.html +++ b/postfix/proto/ADDRESS_REWRITING_README.html @@ -771,9 +771,10 @@ may be a more appropriate vehicle. See the VIRTUAL_README document for an overview of methods to host virtual domains with Postfix.

-

Note: virtual aliasing (virtual_alias_maps) applies to all email -deliveries: local(8), virtual, and remote. This is unlike local -aliasing (alias_maps) which applies only to local(8) delivery.

+

Note: virtual aliasing (virtual_alias_maps) applies to all +recipients: local(8), virtual, and remote. +This is unlike local aliasing (alias_maps) which applies only to +local(8) recipients.

Virtual aliasing is disabled by default. To enable, edit the virtual_alias_maps parameter in the main.cf file and @@ -1061,8 +1062,8 @@ The table can also be used to map "Firstname.Lastname" addresses to login names.

Note: local aliasing (alias_maps) applies only to local(8) -delivery. This is unlike virtual aliasing (virtual_alias_maps) -which applies to all email deliveries: local(8), virtual, and remote. +recipients. This is unlike virtual aliasing (virtual_alias_maps) +which applies to all recipients: local(8), virtual, and remote.

Alias lookups are enabled by default. The default configuration diff --git a/postfix/proto/postconf.proto b/postfix/proto/postconf.proto index 9d03bcb65..0604d2413 100644 --- a/postfix/proto/postconf.proto +++ b/postfix/proto/postconf.proto @@ -490,8 +490,8 @@ alias_database = hash:/etc/mail/aliases

Optional lookup tables with aliases that apply only to local(8) -delivery, unlike virtual_alias_maps that apply to all email deliveries: -local(8), virtual, and remote. +recipients; this is unlike virtual_alias_maps that apply to all +recipients: local(8), virtual, and remote. The table format and lookups are documented in aliases(5). For an overview of Postfix address manipulations see the ADDRESS_REWRITING_README document.

@@ -2013,14 +2013,17 @@ Specify 0 to disable the feature. Valid delays are 0..10. %PARAM inet_interfaces all -

The local network interface addresses that this mail system receives -mail on. Specify "all" to receive mail on all network -interfaces (default), and "loopback-only" to receive mail -on loopback network interfaces only (Postfix version 2.2 and later). The -parameter also controls delivery of mail to user@[ip.address]. -Specify an empty value if Postfix does not receive mail over the network, -or if all network listeners have an explicit IP address in master.cf. -

+

The local network interface addresses that this mail system +receives mail on. Specify "all" to receive mail on all network +interfaces (default), "loopback-only" to receive mail on loopback +network interfaces only (Postfix version 2.2 and later), or zero +or more IPv4 or IPv6 addresses (IPv6 is supported in Postfix version +2.2 and later). The parameter also controls whether Postfix will +accept mail for user@[ip.address], and prevents Postfix +from delivering mail to a host that has equal or larger MX preference. +Specify an empty value if Postfix does not receive mail over the +network, or if all network listeners have an explicit IP address +in master.cf.

Note 1: you need to stop and start Postfix when this parameter changes. @@ -2031,7 +2034,13 @@ but this form is not required here.

When smtp_bind_address and/or smtp_bind_address6 are not specified, the inet_interfaces setting may constrain the source IP -address for an outbound SMTP or LMTP connection.

+address for an outbound SMTP or LMTP connection as described below. +

+ +

The following text is specific to SMTP and IPv4. The same +reasoning applies to the IPv6 protocol, and to the Postfix LMTP +client. To disable IPv4 or IPv6 support in the Postfix SMTP and +LMTP client, use inet_protocols.

A Postfix SMTP client may fail to reach some remote SMTP servers @@ -7285,9 +7290,9 @@ This feature is available in Postfix 2.1 and later. %PARAM virtual_alias_maps $virtual_maps

-Optional lookup tables with aliases that apply to all email deliveries: -local(8), virtual, and remote, unlike alias_maps that apply only -to local(8) delivery. +Optional lookup tables with aliases that apply to all recipients: +local(8), virtual, and remote; this is unlike alias_maps that apply +only to local(8) recipients. The table format and lookups are documented in virtual(5). For an overview of Postfix address manipulations see the ADDRESS_REWRITING_README document. diff --git a/postfix/proto/virtual b/postfix/proto/virtual index 670f570e0..e1935f00b 100644 --- a/postfix/proto/virtual +++ b/postfix/proto/virtual @@ -11,12 +11,12 @@ # \fBpostmap -q - /etc/postfix/virtual <\fIinputfile\fR # DESCRIPTION # The optional \fBvirtual\fR(5) alias table (virtual_alias_maps) -# rewrites all recipients: local(8), virtual, and remote. +# applies to all recipients: local(8), virtual, and remote. # This feature is implemented # in the Postfix \fBcleanup\fR(8) daemon before mail is queued. # # This is unlike the \fBaliases\fR(5) table (alias_maps) which -# is used only for \fBlocal\fR(8) delivery. +# applies only to \fBlocal\fR(8) recipients. # # Virtual aliasing is recursive; to terminate recursion for # a specific address, alias that address to itself. @@ -245,9 +245,9 @@ # and for default values. Use the "\fBpostfix reload\fR" command after # a configuration change. # .IP "\fBvirtual_alias_maps ($virtual_maps)\fR" -# Optional lookup tables with aliases that apply to all email deliveries: -# \fBlocal\fR(8), virtual, and remote, unlike alias_maps that apply only -# to \fBlocal\fR(8) delivery. +# Optional lookup tables with aliases that apply to all recipients: +# \fBlocal\fR(8), virtual, and remote; this is unlike alias_maps that apply +# only to \fBlocal\fR(8) recipients. # .IP "\fBvirtual_alias_domains ($virtual_alias_maps)\fR" # Postfix is the final destination for the specified list of virtual # alias domains, that is, domains for which all addresses are aliased @@ -258,8 +258,8 @@ # .PP # Other parameters of interest: # .IP "\fBinet_interfaces (all)\fR" -# The local network interface addresses that this mail system receives -# mail on. +# The local network interface addresses that this mail system +# receives mail on. # .IP "\fBmydestination ($myhostname, localhost.$mydomain, localhost)\fR" # The list of domains that are delivered via the $local_transport # mail delivery transport. diff --git a/postfix/src/cleanup/cleanup.c b/postfix/src/cleanup/cleanup.c index 6346c4fad..b1f475dcc 100644 --- a/postfix/src/cleanup/cleanup.c +++ b/postfix/src/cleanup/cleanup.c @@ -295,9 +295,9 @@ /* .PP /* Available in Postfix version 2.0 and later: /* .IP "\fBvirtual_alias_maps ($virtual_maps)\fR" -/* Optional lookup tables with aliases that apply to all email deliveries: -/* \fBlocal\fR(8), virtual, and remote, unlike alias_maps that apply only -/* to \fBlocal\fR(8) delivery. +/* Optional lookup tables with aliases that apply to all recipients: +/* \fBlocal\fR(8), virtual, and remote; this is unlike alias_maps that apply +/* only to \fBlocal\fR(8) recipients. /* .PP /* Available in Postfix version 2.2 and later: /* .IP "\fBcanonical_classes (envelope_sender, envelope_recipient, header_sender, header_recipient)\fR" diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h index 1fd879e89..aadda2771 100644 --- a/postfix/src/global/mail_version.h +++ b/postfix/src/global/mail_version.h @@ -20,7 +20,7 @@ * Patches change both the patchlevel and the release date. Snapshots have no * patchlevel; they change the release date only. */ -#define MAIL_RELEASE_DATE "20230507" +#define MAIL_RELEASE_DATE "20230508" #define MAIL_VERSION_NUMBER "3.9" #ifdef SNAPSHOT diff --git a/postfix/src/local/local.c b/postfix/src/local/local.c index ca03e8086..6fa211ed7 100644 --- a/postfix/src/local/local.c +++ b/postfix/src/local/local.c @@ -414,8 +414,8 @@ /* fallback_transport, and luser_relay. /* .IP "\fBalias_maps (see 'postconf -d' output)\fR" /* Optional lookup tables with aliases that apply only to \fBlocal\fR(8) -/* delivery, unlike virtual_alias_maps that apply to all email deliveries: -/* \fBlocal\fR(8), virtual, and remote. +/* recipients; this is unlike virtual_alias_maps that apply to all +/* recipients: \fBlocal\fR(8), virtual, and remote. /* .IP "\fBforward_path (see 'postconf -d' output)\fR" /* The \fBlocal\fR(8) delivery agent search list for finding a .forward /* file with user-specified delivery methods. diff --git a/postfix/src/smtpd/smtpd.c b/postfix/src/smtpd/smtpd.c index 44c3694f3..d498e3833 100644 --- a/postfix/src/smtpd/smtpd.c +++ b/postfix/src/smtpd/smtpd.c @@ -655,8 +655,8 @@ /* The list of domains that are delivered via the $local_transport /* mail delivery transport. /* .IP "\fBinet_interfaces (all)\fR" -/* The local network interface addresses that this mail system receives -/* mail on. +/* The local network interface addresses that this mail system +/* receives mail on. /* .IP "\fBproxy_interfaces (empty)\fR" /* The remote network interface addresses that this mail system receives mail /* on by way of a proxy or network address translation unit. @@ -691,9 +691,9 @@ /* alias domains, that is, domains for which all addresses are aliased /* to addresses in other local or remote domains. /* .IP "\fBvirtual_alias_maps ($virtual_maps)\fR" -/* Optional lookup tables with aliases that apply to all email deliveries: -/* \fBlocal\fR(8), virtual, and remote, unlike alias_maps that apply only -/* to \fBlocal\fR(8) delivery. +/* Optional lookup tables with aliases that apply to all recipients: +/* \fBlocal\fR(8), virtual, and remote; this is unlike alias_maps that apply +/* only to \fBlocal\fR(8) recipients. /* .IP "\fBunknown_virtual_alias_reject_code (550)\fR" /* The Postfix SMTP server reply code when a recipient address matches /* $virtual_alias_domains, and $virtual_alias_maps specifies a list -- 2.47.3