diff --git a/postfix/HISTORY b/postfix/HISTORY index dc80b6d45..61b4c8521 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -26306,3 +26306,25 @@ Apologies for any names omitted. util/htable.c. Cleanup: unused initialization. File: util/make_dirs.c + +20220222 + + Documentation: updated comment text. File: util/hash_fnv.c. + +29220312 + + Cleanup: when a main.cf like file may have changed while + it was read, forget the settings before re-reading the file. + File: util/dict.c. + +20220322 + + Cleanup: added missing _checks, _reply_footer, _reply_filter, + _command_filter, and _delivery_status_filter parameter names + to the proxy_read_maps default value. Files: global/mail_params.h, + mantools/missing-proxy-read-maps. + +20220325 + + Documentation: how to stop recursion in virtual_alias_maps. + File: proto/virtual. diff --git a/postfix/WISHLIST b/postfix/WISHLIST index 7e0bc51a8..c6672507e 100644 --- a/postfix/WISHLIST +++ b/postfix/WISHLIST @@ -6,6 +6,18 @@ Wish list: Disable -DSNAPSHOT and -DNONPROD in makedefs. + postscreen_dnsbl_sites is evaluated in the reverse order, breaking + expectations when different reply patterns have different weights. + We need a compatibility_level feature to correct this. + + In the cleanup daemon, open the milter*header_checks greedily, + before the chroot() call. This code is implemented and needs + to be tested. + + In the pgsql: client, make the client encoding configurable + with a sensible default (UTF8). This code is implemented + and needs to be tested. + FILTER_README needs some text on multi-instance implementations, and existing multi-instance references need to be updated. diff --git a/postfix/conf/virtual b/postfix/conf/virtual index 96390fee8..e99eee488 100644 --- a/postfix/conf/virtual +++ b/postfix/conf/virtual @@ -14,92 +14,95 @@ # The optional virtual(5) alias table rewrites recipient # addresses for all local, all virtual, and all remote mail # destinations. This is unlike the aliases(5) table which -# is used only for local(8) delivery. Virtual aliasing is -# recursive, and is implemented by the Postfix cleanup(8) -# daemon before mail is queued. +# is used only for local(8) delivery. This feature is imple- +# mented in the Postfix cleanup(8) daemon before mail is +# queued. +# +# Virtual aliasing is recursive; to terminate recursion for +# a specific address, alias that address to itself. # # The main applications of virtual aliasing are: # -# o To redirect mail for one address to one or more +# o To redirect mail for one address to one or more # addresses. # -# o To implement virtual alias domains where all -# addresses are aliased to addresses in other +# o To implement virtual alias domains where all +# addresses are aliased to addresses in other # domains. # -# Virtual alias domains are not to be confused with -# the virtual mailbox domains that are implemented -# with the Postfix virtual(8) mail delivery agent. -# With virtual mailbox domains, each recipient +# Virtual alias domains are not to be confused with +# the virtual mailbox domains that are implemented +# with the Postfix virtual(8) mail delivery agent. +# With virtual mailbox domains, each recipient # address can have its own mailbox. # -# Virtual aliasing is applied only to recipient envelope -# addresses, and does not affect message headers. Use -# canonical(5) mapping to rewrite header and envelope +# Virtual aliasing is applied only to recipient envelope +# addresses, and does not affect message headers. Use +# canonical(5) mapping to rewrite header and envelope # addresses in general. # -# Normally, the virtual(5) alias table is specified as a -# text file that serves as input to the postmap(1) command. -# The result, an indexed file in dbm or db format, is used +# Normally, the virtual(5) alias table is specified as a +# text file that serves as input to the postmap(1) command. +# The result, an indexed file in dbm or db format, is used # for fast searching by the mail system. Execute the command -# "postmap /etc/postfix/virtual" to rebuild an indexed file +# "postmap /etc/postfix/virtual" to rebuild an indexed file # after changing the corresponding text file. # -# When the table is provided via other means such as NIS, -# LDAP or SQL, the same lookups are done as for ordinary +# When the table is provided via other means such as NIS, +# LDAP or SQL, the same lookups are done as for ordinary # indexed files. # -# Alternatively, the table can be provided as a regu- -# lar-expression map where patterns are given as regular -# expressions, or lookups can be directed to a TCP-based -# server. In those case, the lookups are done in a slightly +# Alternatively, the table can be provided as a regu- +# lar-expression map where patterns are given as regular +# expressions, or lookups can be directed to a TCP-based +# server. In those case, the lookups are done in a slightly # different way as described below under "REGULAR EXPRESSION # TABLES" or "TCP-BASED TABLES". # # CASE FOLDING -# The search string is folded to lowercase before database -# lookup. As of Postfix 2.3, the search string is not case -# folded with database types such as regexp: or pcre: whose +# The search string is folded to lowercase before database +# lookup. As of Postfix 2.3, the search string is not case +# folded with database types such as regexp: or pcre: whose # lookup fields can match both upper and lower case. # # TABLE FORMAT # The input format for the postmap(1) command is as follows: # # pattern address, address, ... -# When pattern matches a mail address, replace it by +# When pattern matches a mail address, replace it by # the corresponding address. # # blank lines and comments -# Empty lines and whitespace-only lines are ignored, -# as are lines whose first non-whitespace character +# Empty lines and whitespace-only lines are ignored, +# as are lines whose first non-whitespace character # is a `#'. # # multi-line text -# A logical line starts with non-whitespace text. A -# line that starts with whitespace continues a logi- +# A logical line starts with non-whitespace text. A +# line that starts with whitespace continues a logi- # cal line. # # TABLE SEARCH ORDER # With lookups from indexed files such as DB or DBM, or from -# networked tables such as NIS, LDAP or SQL, each +# networked tables such as NIS, LDAP or SQL, each # user@domain query produces a sequence of query patterns as # described below. # -# Each query pattern is sent to each specified lookup table -# before trying the next query pattern, until a match is +# Each query pattern is sent to each specified lookup table +# before trying the next query pattern, until a match is # found. # # user@domain address, address, ... -# Redirect mail for user@domain to address. This +# Redirect mail for user@domain to address. This # form has the highest precedence. # # user address, address, ... # Redirect mail for user@site to address when site is -# equal to $myorigin, when site is listed in $mydes- -# tination, or when it is listed in $inet_interfaces +# equal to $myorigin, when site is listed in $mydes- +# tination, or when it is listed in $inet_interfaces # or $proxy_interfaces. # -# This functionality overlaps with the functionality +# This functionality overlaps with the functionality # of the local aliases(5) database. The difference is # that virtual(5) mapping can be applied to non-local # addresses. @@ -108,18 +111,18 @@ # Redirect mail for other users in domain to address. # This form has the lowest precedence. # -# Note: @domain is a wild-card. With this form, the -# Postfix SMTP server accepts mail for any recipient -# in domain, regardless of whether that recipient -# exists. This may turn your mail system into a -# backscatter source: Postfix first accepts mail for -# non-existent recipients and then tries to return -# that mail as "undeliverable" to the often forged +# Note: @domain is a wild-card. With this form, the +# Postfix SMTP server accepts mail for any recipient +# in domain, regardless of whether that recipient +# exists. This may turn your mail system into a +# backscatter source: Postfix first accepts mail for +# non-existent recipients and then tries to return +# that mail as "undeliverable" to the often forged # sender address. # -# To avoid backscatter with mail for a wild-card +# To avoid backscatter with mail for a wild-card # domain, replace the wild-card mapping with explicit -# 1:1 mappings, or add a reject_unverified_recipient +# 1:1 mappings, or add a reject_unverified_recipient # restriction for that domain: # # smtpd_recipient_restrictions = @@ -129,19 +132,19 @@ # inline:{example.com=reject_unverified_recipient} # unverified_recipient_reject_code = 550 # -# In the above example, Postfix may contact a remote -# server if the recipient is aliased to a remote +# In the above example, Postfix may contact a remote +# server if the recipient is aliased to a remote # address. # # RESULT ADDRESS REWRITING # The lookup result is subject to address rewriting: # -# o When the result has the form @otherdomain, the -# result becomes the same user in otherdomain. This +# o When the result has the form @otherdomain, the +# result becomes the same user in otherdomain. This # works only for the first address in a multi-address # lookup result. # -# o When "append_at_myorigin=yes", append "@$myorigin" +# o When "append_at_myorigin=yes", append "@$myorigin" # to addresses without "@domain". # # o When "append_dot_mydomain=yes", append ".$mydomain" @@ -149,29 +152,29 @@ # # ADDRESS EXTENSION # When a mail address localpart contains the optional recip- -# ient delimiter (e.g., user+foo@domain), the lookup order +# ient delimiter (e.g., user+foo@domain), the lookup order # becomes: user+foo@domain, user@domain, user+foo, user, and # @domain. # -# The propagate_unmatched_extensions parameter controls -# whether an unmatched address extension (+foo) is propa- +# The propagate_unmatched_extensions parameter controls +# whether an unmatched address extension (+foo) is propa- # gated to the result of a table lookup. # # VIRTUAL ALIAS DOMAINS -# Besides virtual aliases, the virtual alias table can also +# Besides virtual aliases, the virtual alias table can also # be used to implement virtual alias domains. With a virtual -# alias domain, all recipient addresses are aliased to +# alias domain, all recipient addresses are aliased to # addresses in other domains. # # Virtual alias domains are not to be confused with the vir- # tual mailbox domains that are implemented with the Postfix # virtual(8) mail delivery agent. With virtual mailbox -# domains, each recipient address can have its own mailbox. +# domains, each recipient address can have its own mailbox. # -# With a virtual alias domain, the virtual domain has its -# own user name space. Local (i.e. non-virtual) usernames -# are not visible in a virtual alias domain. In particular, -# local aliases(5) and local mailing lists are not visible +# With a virtual alias domain, the virtual domain has its +# own user name space. Local (i.e. non-virtual) usernames +# are not visible in a virtual alias domain. In particular, +# local aliases(5) and local mailing lists are not visible # as localname@virtual-alias.domain. # # Support for a virtual alias domain looks like: @@ -180,7 +183,7 @@ # virtual_alias_maps = hash:/etc/postfix/virtual # # Note: some systems use dbm databases instead of hash. See -# the output from "postconf -m" for available database +# the output from "postconf -m" for available database # types. # # /etc/postfix/virtual: @@ -189,81 +192,81 @@ # user1@virtual-alias.domain address1 # user2@virtual-alias.domain address2, address3 # -# The virtual-alias.domain anything entry is required for a +# The virtual-alias.domain anything entry is required for a # virtual alias domain. Without this entry, mail is rejected -# with "relay access denied", or bounces with "mail loops +# with "relay access denied", or bounces with "mail loops # back to myself". # -# Do not specify virtual alias domain names in the main.cf +# Do not specify virtual alias domain names in the main.cf # mydestination or relay_domains configuration parameters. # -# With a virtual alias domain, the Postfix SMTP server -# accepts mail for known-user@virtual-alias.domain, and -# rejects mail for unknown-user@virtual-alias.domain as +# With a virtual alias domain, the Postfix SMTP server +# accepts mail for known-user@virtual-alias.domain, and +# rejects mail for unknown-user@virtual-alias.domain as # undeliverable. # -# Instead of specifying the virtual alias domain name via -# the virtual_alias_maps table, you may also specify it via +# Instead of specifying the virtual alias domain name via +# the virtual_alias_maps table, you may also specify it via # the main.cf virtual_alias_domains configuration parameter. -# This latter parameter uses the same syntax as the main.cf +# This latter parameter uses the same syntax as the main.cf # mydestination configuration parameter. # # 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 address being looked up. Thus, user@domain mail -# addresses are not broken up into their user and @domain +# 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 ta- -# ble, until a pattern is found that matches the search +# Patterns are applied in the order as specified in the ta- +# ble, until a pattern is found that matches the search # string. # -# Results are the same as with indexed file lookups, with -# the additional feature that parenthesized substrings from +# Results 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. # # TCP-BASED TABLES -# This section describes how the table lookups change when +# This section describes how the table lookups change when # lookups are directed to a TCP-based server. For a descrip- # tion of the TCP client/server lookup protocol, see tcp_ta- -# ble(5). This feature is available in Postfix 2.5 and +# ble(5). This feature is available in Postfix 2.5 and # later. # # Each lookup operation uses the entire address once. Thus, -# 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. # # Results are the same as with indexed file lookups. # # BUGS -# The table format does not understand quoting conventions. +# The table format does not understand quoting conventions. # # CONFIGURATION PARAMETERS -# The following main.cf parameters are especially relevant -# to this topic. See the Postfix main.cf file for syntax -# details and for default values. Use the "postfix reload" +# The following main.cf parameters are especially relevant +# to this topic. See the Postfix main.cf file for syntax +# details and for default values. Use the "postfix reload" # command after a configuration change. # # virtual_alias_maps ($virtual_maps) -# Optional lookup tables that alias specific mail -# addresses or domains to other local or remote +# Optional lookup tables that alias specific mail +# addresses or domains to other local or remote # addresses. # # virtual_alias_domains ($virtual_alias_maps) -# Postfix is the final destination for the specified +# 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 +# which all addresses are aliased to addresses in # other local or remote domains. # # propagate_unmatched_extensions (canonical, virtual) -# What address lookup tables copy an address exten- +# What address lookup tables copy an address exten- # sion from the lookup key to the lookup result. # # Other parameters of interest: @@ -274,23 +277,23 @@ # # mydestination ($myhostname, localhost.$mydomain, local- # host) -# The list of domains that are delivered via the +# The list of domains that are delivered via the # $local_transport mail delivery transport. # # myorigin ($myhostname) # The domain name that locally-posted mail appears to -# come from, and that locally posted mail is deliv- +# come from, and that locally posted mail is deliv- # ered to. # # owner_request_special (yes) # Enable special treatment for owner-listname entries # in the aliases(5) file, and don't split owner-list- -# name and listname-request address localparts when +# name and listname-request address localparts when # the recipient_delimiter is set to "-". # # proxy_interfaces (empty) # The network interface addresses that this mail sys- -# tem receives mail on by way of a proxy or network +# tem receives mail on by way of a proxy or network # address translation unit. # # SEE ALSO @@ -300,14 +303,14 @@ # canonical(5), canonical address mapping # # README FILES -# Use "postconf readme_directory" or "postconf html_direc- +# Use "postconf readme_directory" or "postconf html_direc- # tory" to locate this information. # ADDRESS_REWRITING_README, address rewriting guide # DATABASE_README, Postfix lookup table overview # VIRTUAL_README, domain hosting guide # # 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/virtual.5.html b/postfix/html/virtual.5.html index 27b139285..590b35714 100644 --- a/postfix/html/virtual.5.html +++ b/postfix/html/virtual.5.html @@ -20,95 +20,98 @@ VIRTUAL(5) VIRTUAL(5) The optional virtual(5) alias table rewrites recipient addresses for all local, all virtual, and all remote mail destinations. This is unlike the aliases(5) table which is used only for local(8) delivery. - Virtual aliasing is recursive, and is implemented by the Postfix - cleanup(8) daemon before mail is queued. + This feature is implemented in the Postfix cleanup(8) daemon before + mail is queued. + + Virtual aliasing is recursive; to terminate recursion for a specific + address, alias that address to itself. The main applications of virtual aliasing are: o To redirect mail for one address to one or more addresses. - o To implement virtual alias domains where all addresses are + o To implement virtual alias domains where all addresses are aliased to addresses in other domains. - Virtual alias domains are not to be confused with the virtual + Virtual alias domains are not to be confused with the virtual mailbox domains that are implemented with the Postfix virtual(8) - mail delivery agent. With virtual mailbox domains, each recipi- + mail delivery agent. With virtual mailbox domains, each recipi- ent address can have its own mailbox. - Virtual aliasing is applied only to recipient envelope addresses, and - does not affect message headers. Use canonical(5) mapping to rewrite + Virtual aliasing is applied only to recipient envelope addresses, and + does not affect message headers. Use canonical(5) mapping to rewrite header and envelope addresses in general. - Normally, the virtual(5) alias table is specified as a text file that + Normally, the virtual(5) alias table is specified as a text file that serves as input to the postmap(1) command. The result, an indexed file - in dbm or db format, is used for fast searching by the mail system. + in dbm or db format, is used for fast searching by the mail system. Execute the command "postmap /etc/postfix/virtual" to rebuild an indexed file after changing the corresponding text file. - When the table is provided via other means such as NIS, LDAP or SQL, + When the table is provided via other means such as NIS, LDAP or SQL, the same lookups are done as for ordinary indexed files. - Alternatively, the table can be provided as a regular-expression map - where patterns are given as regular expressions, or lookups can be - directed to a TCP-based server. In those case, the lookups are done in - a slightly different way as described below under "REGULAR EXPRESSION + Alternatively, the table can be provided as a regular-expression map + where patterns are given as regular expressions, or lookups can be + directed to a TCP-based server. In those case, the lookups are done in + a slightly different way as described below under "REGULAR EXPRESSION TABLES" or "TCP-BASED TABLES". CASE FOLDING - The search string is folded to lowercase before database lookup. As of - Postfix 2.3, the search string is not case folded with database types - such as regexp: or pcre: whose lookup fields can match both upper and + The search string is folded to lowercase before database lookup. As of + Postfix 2.3, the search string is not case folded with database types + such as regexp: or pcre: whose lookup fields can match both upper and lower case. TABLE FORMAT The input format for the postmap(1) command is as follows: pattern address, address, ... - When pattern matches a mail address, replace it by the corre- + When pattern matches a mail address, replace it by the corre- sponding address. blank lines and comments - Empty lines and whitespace-only lines are ignored, as are lines + Empty lines and whitespace-only lines are ignored, as are lines whose first non-whitespace character is a `#'. multi-line text - A logical line starts with non-whitespace text. A line that + A logical line starts with non-whitespace text. A line that starts with whitespace continues a logical line. TABLE SEARCH ORDER - With lookups from indexed files such as DB or DBM, or from networked - tables such as NIS, LDAP or SQL, each user@domain query produces a + With lookups from indexed files such as DB or DBM, or from networked + tables such as NIS, LDAP or SQL, each user@domain query produces a sequence of query patterns as described below. Each query pattern is sent to each specified lookup table before trying the next query pattern, until a match is found. user@domain address, address, ... - Redirect mail for user@domain to address. This form has the + Redirect mail for user@domain to address. This form has the highest precedence. user address, address, ... - Redirect mail for user@site to address when site is equal to - $myorigin, when site is listed in $mydestination, or when it is + Redirect mail for user@site to address when site is equal to + $myorigin, when site is listed in $mydestination, or when it is listed in $inet_interfaces or $proxy_interfaces. - This functionality overlaps with the functionality of the local - aliases(5) database. The difference is that virtual(5) mapping + This functionality overlaps with the functionality of the local + aliases(5) database. The difference is that virtual(5) mapping can be applied to non-local addresses. @domain address, address, ... - Redirect mail for other users in domain to address. This form + Redirect mail for other users in domain to address. This form has the lowest precedence. - Note: @domain is a wild-card. With this form, the Postfix SMTP - server accepts mail for any recipient in domain, regardless of - whether that recipient exists. This may turn your mail system - into a backscatter source: Postfix first accepts mail for - non-existent recipients and then tries to return that mail as + Note: @domain is a wild-card. With this form, the Postfix SMTP + server accepts mail for any recipient in domain, regardless of + whether that recipient exists. This may turn your mail system + into a backscatter source: Postfix first accepts mail for + non-existent recipients and then tries to return that mail as "undeliverable" to the often forged sender address. - To avoid backscatter with mail for a wild-card domain, replace - the wild-card mapping with explicit 1:1 mappings, or add a + To avoid backscatter with mail for a wild-card domain, replace + the wild-card mapping with explicit 1:1 mappings, or add a reject_unverified_recipient restriction for that domain: smtpd_recipient_restrictions = @@ -124,11 +127,11 @@ VIRTUAL(5) VIRTUAL(5) RESULT ADDRESS REWRITING The lookup result is subject to address rewriting: - o When the result has the form @otherdomain, the result becomes - the same user in otherdomain. This works only for the first + o When the result has the form @otherdomain, the result becomes + the same user in otherdomain. This works only for the first address in a multi-address lookup result. - o When "append_at_myorigin=yes", append "@$myorigin" to addresses + o When "append_at_myorigin=yes", append "@$myorigin" to addresses without "@domain". o When "append_dot_mydomain=yes", append ".$mydomain" to addresses @@ -136,26 +139,26 @@ VIRTUAL(5) VIRTUAL(5) ADDRESS EXTENSION When a mail address localpart contains the optional recipient delimiter - (e.g., user+foo@domain), the lookup order becomes: user+foo@domain, + (e.g., user+foo@domain), the lookup order becomes: user+foo@domain, user@domain, user+foo, user, and @domain. - The propagate_unmatched_extensions parameter controls whether an + The propagate_unmatched_extensions parameter controls whether an unmatched address extension (+foo) is propagated to the result of a ta- ble lookup. VIRTUAL ALIAS DOMAINS - Besides virtual aliases, the virtual alias table can also be used to - implement virtual alias domains. With a virtual alias domain, all + Besides virtual aliases, the virtual alias table can also be used to + implement virtual alias domains. With a virtual alias domain, all recipient addresses are aliased to addresses in other domains. - Virtual alias domains are not to be confused with the virtual mailbox - domains that are implemented with the Postfix virtual(8) mail delivery - agent. With virtual mailbox domains, each recipient address can have + Virtual alias domains are not to be confused with the virtual mailbox + domains that are implemented with the Postfix virtual(8) mail delivery + agent. With virtual mailbox domains, each recipient address can have its own mailbox. - With a virtual alias domain, the virtual domain has its own user name - space. Local (i.e. non-virtual) usernames are not visible in a virtual - alias domain. In particular, local aliases(5) and local mailing lists + With a virtual alias domain, the virtual domain has its own user name + space. Local (i.e. non-virtual) usernames are not visible in a virtual + alias domain. In particular, local aliases(5) and local mailing lists are not visible as localname@virtual-alias.domain. Support for a virtual alias domain looks like: @@ -163,7 +166,7 @@ VIRTUAL(5) VIRTUAL(5) /etc/postfix/main.cf: virtual_alias_maps = hash:/etc/postfix/virtual - Note: some systems use dbm databases instead of hash. See the output + Note: some systems use dbm databases instead of hash. See the output from "postconf -m" for available database types. /etc/postfix/virtual: @@ -173,46 +176,46 @@ VIRTUAL(5) VIRTUAL(5) user2@virtual-alias.domain address2, address3 The virtual-alias.domain anything entry is required for a virtual alias - domain. Without this entry, mail is rejected with "relay access + domain. Without this entry, mail is rejected with "relay access denied", or bounces with "mail loops back to myself". - Do not specify virtual alias domain names in the main.cf mydestination + Do not specify virtual alias domain names in the main.cf mydestination or relay_domains configuration parameters. - With a virtual alias domain, the Postfix SMTP server accepts mail for + With a virtual alias domain, the Postfix SMTP server accepts mail for known-user@virtual-alias.domain, and rejects mail for unknown-user@vir- tual-alias.domain as undeliverable. - Instead of specifying the virtual alias domain name via the vir- - tual_alias_maps table, you may also specify it via the main.cf vir- + Instead of specifying the virtual alias domain name via the vir- + tual_alias_maps table, you may also specify it via the main.cf vir- tual_alias_domains configuration parameter. This latter parameter uses the same syntax as the main.cf mydestination configuration parameter. REGULAR EXPRESSION TABLES - This section describes how the table lookups change when the table is - given in the form of regular expressions. For a description of regular + 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, see regexp_table(5) or pcre_table(5). - Each pattern is a regular expression that is applied to the entire - address being looked up. Thus, user@domain mail addresses are not bro- - ken up into their user and @domain constituent parts, nor is user+foo + Each pattern is a regular expression that is applied to the entire + address being looked up. Thus, user@domain mail addresses are not bro- + ken 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 + Patterns are applied in the order as specified in the table, until a pattern is found that matches the search string. - Results are the same as with indexed file lookups, with the additional - feature that parenthesized substrings from the pattern can be interpo- + Results are the same as with indexed file lookups, with the additional + feature that parenthesized substrings from the pattern can be interpo- lated as $1, $2 and so on. TCP-BASED TABLES - This section describes how the table lookups change when lookups are - directed to a TCP-based server. For a description of the TCP - client/server lookup protocol, see tcp_table(5). This feature is + This section describes how the table lookups change when lookups are + directed to a TCP-based server. For a description of the TCP + client/server lookup protocol, see tcp_table(5). This feature is available in Postfix 2.5 and later. - Each lookup operation uses the entire address once. Thus, user@domain - mail addresses are not broken up into their user and @domain con- + Each lookup operation uses the entire address once. Thus, user@domain + mail addresses are not broken up into their user and @domain con- stituent parts, nor is user+foo broken up into user and foo. Results are the same as with indexed file lookups. @@ -226,40 +229,40 @@ VIRTUAL(5) VIRTUAL(5) Use the "postfix reload" command after a configuration change. virtual_alias_maps ($virtual_maps) - Optional lookup tables that alias specific mail addresses or + Optional lookup tables that alias specific mail addresses or domains to other local or remote addresses. virtual_alias_domains ($virtual_alias_maps) - Postfix is the final destination for the specified list of vir- + Postfix is the final destination for the specified list of vir- tual alias domains, that is, domains for which all addresses are aliased to addresses in other local or remote domains. propagate_unmatched_extensions (canonical, virtual) - What address lookup tables copy an address extension from the + What address lookup tables copy an address extension from the lookup key to the lookup result. Other parameters of interest: inet_interfaces (all) - The network interface addresses that this mail system receives + The network interface addresses that this mail system receives mail on. mydestination ($myhostname, localhost.$mydomain, localhost) - The list of domains that are delivered via the $local_transport + The list of domains that are delivered via the $local_transport mail delivery transport. myorigin ($myhostname) - The domain name that locally-posted mail appears to come from, + The domain name that locally-posted mail appears to come from, and that locally posted mail is delivered to. owner_request_special (yes) - Enable special treatment for owner-listname entries in the + Enable special treatment for owner-listname entries in the aliases(5) file, and don't split owner-listname and list- - name-request address localparts when the recipient_delimiter is + name-request address localparts when the recipient_delimiter is set to "-". proxy_interfaces (empty) - The network interface addresses that this mail system receives + The network interface addresses that this mail system receives mail on by way of a proxy or network address translation unit. SEE ALSO diff --git a/postfix/man/man5/virtual.5 b/postfix/man/man5/virtual.5 index 702f060ef..5a66c7f53 100644 --- a/postfix/man/man5/virtual.5 +++ b/postfix/man/man5/virtual.5 @@ -20,9 +20,11 @@ The optional \fBvirtual\fR(5) alias table rewrites recipient addresses for all local, all virtual, and all remote mail destinations. This is unlike the \fBaliases\fR(5) table which is used -only for \fBlocal\fR(8) delivery. Virtual aliasing is -recursive, and is implemented by the Postfix \fBcleanup\fR(8) -daemon before mail is queued. +only for \fBlocal\fR(8) delivery. This feature is implemented +in the Postfix \fBcleanup\fR(8) daemon before mail is queued. + +Virtual aliasing is recursive; to terminate recursion for +a specific address, alias that address to itself. The main applications of virtual aliasing are: .IP \(bu diff --git a/postfix/mantools/missing-proxy-read-maps b/postfix/mantools/missing-proxy-read-maps index 11ddc4fbe..c6d1d26b7 100755 --- a/postfix/mantools/missing-proxy-read-maps +++ b/postfix/mantools/missing-proxy-read-maps @@ -47,7 +47,7 @@ open(ALL_PARAM_NAMES, "$command|") || die "can't execute $command: !$\n"; while ($param_name = ) { chomp($param_name); - next unless ($param_name =~ /_maps$/); + next unless ($param_name =~ /_(checks|delivery_status_filter|reply_filter|command_filter|maps)$/); next if ($param_name =~ /^(proxy_read|proxy_write)_maps$/); next if defined($proxy_read_maps{$param_name}); die "unknown parameter: $param_name\n" diff --git a/postfix/proto/virtual b/postfix/proto/virtual index 84edde41c..6e328817c 100644 --- a/postfix/proto/virtual +++ b/postfix/proto/virtual @@ -14,9 +14,11 @@ # addresses for all local, all virtual, and all remote mail # destinations. # This is unlike the \fBaliases\fR(5) table which is used -# only for \fBlocal\fR(8) delivery. Virtual aliasing is -# recursive, and is implemented by the Postfix \fBcleanup\fR(8) -# daemon before mail is queued. +# only for \fBlocal\fR(8) delivery. This feature is implemented +# in the Postfix \fBcleanup\fR(8) daemon before mail is queued. +# +# Virtual aliasing is recursive; to terminate recursion for +# a specific address, alias that address to itself. # # The main applications of virtual aliasing are: # .IP \(bu diff --git a/postfix/src/global/mail_params.h b/postfix/src/global/mail_params.h index 01cce33ce..e728006e3 100644 --- a/postfix/src/global/mail_params.h +++ b/postfix/src/global/mail_params.h @@ -2502,7 +2502,33 @@ extern int var_local_rcpt_code; " $" VAR_PSC_REJ_FTR_MAPS \ " $" VAR_SMTPD_REJ_FTR_MAPS \ " $" VAR_TLS_SERVER_SNI_MAPS \ - " $" VAR_TLSP_CLNT_POLICY + " $" VAR_TLSP_CLNT_POLICY \ + " $" VAR_DSN_FILTER \ + " $" VAR_LMTP_DSN_FILTER \ + " $" VAR_LMTP_DNS_RE_FILTER \ + " $" VAR_LMTP_RESP_FILTER \ + " $" VAR_LOCAL_DSN_FILTER \ + " $" VAR_PIPE_DSN_FILTER \ + " $" VAR_PSC_CMD_FILTER \ + " $" VAR_SMTP_DSN_FILTER \ + " $" VAR_SMTP_DNS_RE_FILTER \ + " $" VAR_SMTP_RESP_FILTER \ + " $" VAR_SMTPD_CMD_FILTER \ + " $" VAR_SMTPD_DNS_RE_FILTER \ + " $" VAR_VIRT_DSN_FILTER \ + " $" VAR_BODY_CHECKS \ + " $" VAR_HEADER_CHECKS \ + " $" VAR_LMTP_BODY_CHKS \ + " $" VAR_LMTP_HEAD_CHKS \ + " $" VAR_LMTP_MIME_CHKS \ + " $" VAR_LMTP_NEST_CHKS \ + " $" VAR_MILT_HEAD_CHECKS \ + " $" VAR_MIMEHDR_CHECKS \ + " $" VAR_NESTHDR_CHECKS \ + " $" VAR_SMTP_BODY_CHKS \ + " $" VAR_SMTP_HEAD_CHKS \ + " $" VAR_SMTP_MIME_CHKS \ + " $" VAR_SMTP_NEST_CHKS extern char *var_proxy_read_maps; #define VAR_PROXY_WRITE_MAPS "proxy_write_maps" diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h index 2542fa37e..b27d33690 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 "20220220" +#define MAIL_RELEASE_DATE "20220325" #define MAIL_VERSION_NUMBER "3.8" #ifdef SNAPSHOT diff --git a/postfix/src/util/dict.c b/postfix/src/util/dict.c index 5d53860f1..cb17601c5 100644 --- a/postfix/src/util/dict.c +++ b/postfix/src/util/dict.c @@ -463,6 +463,7 @@ int dict_load_file_xt(const char *dict_name, const char *path) if (msg_verbose > 1) msg_info("pausing to let %s cool down", path); doze(300000); + dict_unregister(dict_name); } return (1); } diff --git a/postfix/src/util/hash_fnv.c b/postfix/src/util/hash_fnv.c index b56d176ac..b4d7b304b 100644 --- a/postfix/src/util/hash_fnv.c +++ b/postfix/src/util/hash_fnv.c @@ -19,18 +19,16 @@ /* strings, avoiding an unnecessary strlen() call. /* /* To thwart collision attacks, the hash function is seeded -/* once from /dev/urandom, and if that is unavailable, from -/* wallclock time, monotonic system clocks, and the process -/* ID. To disable seeding (typically, for regression tests), -/* specify the NORANDOMIZE environment variable; the value -/* does not matter. +/* once with ldseed(). To disable seeding (typically, to make +/* tests predictable), specify the NORANDOMIZE environment +/* variable; the value does not matter. /* -/* This function implements a workaround for a "sticky state" -/* problem with FNV hash functions: when an input produces a -/* zero hash state, and the next input byte is zero, then the -/* hash state would not change. To avoid this, hash_fnv() adds -/* 1 to each input value. Compile with -DSTRICT_FNV1A to get -/* the standard behavior. +/* This implementation works around a "sticky state" problem +/* with FNV hash functions: when an input produces a zero hash +/* state, and the next input byte is zero, then the hash state +/* would not change. To avoid this, hash_fnv() adds 1 to each +/* input value. Compile with -DSTRICT_FNV1A to get the standard +/* behavior. /* /* The default HASH_FNV_T result type is uint64_t. When compiled /* with -DUSE_FNV_32BIT, the result type is uint32_t. On ancient