diff --git a/postfix/HISTORY b/postfix/HISTORY index 76ae1c079..c1da099b3 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -27760,3 +27760,15 @@ Apologies for any names omitted. is readable, then it says that the socket has unread data, and then it says that read returns EOF, causing Postfix to spam the log with a warning message. File: tlsmgr/tlsmgr.c. + +20240125 + + Cleanup: tlsmgr.c fix 20240124. File: tlsmgr/tlsmgr.c. + + Documentation: updated obsolete "CONFIGURATION PARAMETERS" + summaries in Postfix manpages, with current text from the + postconf(5) manpage. Files: proto/generic, proto/header_checks, + proto/aliases, proto/canonical, proto/relocated, + postdrop/postdrop.c, postsuper/postsuper.c, sendmail/sendmail.c, + dnsblog/dnsblog.c, postkick/postkick.c, postlock/postlock.c, + qmgr/qmgr.c, qmqpd/qmqpd.c, trivial-rewrite/trivial-rewrite.c. diff --git a/postfix/conf/aliases b/postfix/conf/aliases index 6849e7e1d..280c3d256 100644 --- a/postfix/conf/aliases +++ b/postfix/conf/aliases @@ -200,9 +200,9 @@ decode: root # # 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), vir- -# tual, and remote. +# to local(8) recipients; this is unlike vir- +# tual_alias_maps that apply to all recipients: +# local(8), virtual, and remote. # # allow_mail_to_commands (alias, forward) # Restrict local(8) mail delivery to external com- diff --git a/postfix/conf/canonical b/postfix/conf/canonical index 4957fcc4f..894fd5bcd 100644 --- a/postfix/conf/canonical +++ b/postfix/conf/canonical @@ -225,57 +225,56 @@ # Other parameters of interest: # # inet_interfaces (all) -# The network interface addresses that this mail sys- -# tem receives mail on. +# The local network interface addresses that this +# mail system receives mail on. # # local_header_rewrite_clients (permit_inet_interfaces) -# Rewrite message header addresses in mail from these -# clients and update incomplete addresses with the -# domain name in $myorigin or $mydomain; either don't -# rewrite message headers from other clients at all, -# or rewrite message headers and update incomplete -# addresses with the domain specified in the -# remote_header_rewrite_domain parameter. +# Rewrite or add message headers in mail from these +# clients, updating incomplete addresses with the +# domain name in $myorigin or $mydomain, and adding +# missing headers. # # proxy_interfaces (empty) -# The network interface addresses that this mail sys- -# tem receives mail on by way of a proxy or network -# address translation unit. +# The remote network interface addresses that this +# mail system receives mail on by way of a proxy or +# network address translation unit. # -# masquerade_classes (envelope_sender, header_sender, +# masquerade_classes (envelope_sender, header_sender, # header_recipient) # What addresses are subject to address masquerading. # # masquerade_domains (empty) -# Optional list of domains whose subdomain structure +# Optional list of domains whose subdomain structure # will be stripped off in email addresses. # # masquerade_exceptions (empty) -# Optional list of user names that are not subjected -# to address masquerading, even when their addresses +# Optional list of user names that are not subjected +# to address masquerading, even when their addresses # match $masquerade_domains. # # 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 "-". # # remote_header_rewrite_domain (empty) -# Don't rewrite message headers from remote clients -# at all when this parameter is empty; otherwise, re- -# write message headers and append the specified -# domain name to incomplete addresses. +# Rewrite or add message headers in mail from remote +# clients if the remote_header_rewrite_domain parame- +# ter value is non-empty, updating incomplete +# addresses with the domain specified in the +# remote_header_rewrite_domain parameter, and adding +# missing headers. # # SEE ALSO # cleanup(8), canonicalize and enqueue mail @@ -284,13 +283,13 @@ # virtual(5), virtual aliasing # # README FILES -# Use "postconf readme_directory" or "postconf html_direc- +# Use "postconf readme_directory" or "postconf html_direc- # tory" to locate this information. # DATABASE_README, Postfix lookup table overview # ADDRESS_REWRITING_README, address rewriting 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/conf/generic b/postfix/conf/generic index f371eb9a5..508e44a42 100644 --- a/postfix/conf/generic +++ b/postfix/conf/generic @@ -193,13 +193,13 @@ # Other parameters of interest: # # inet_interfaces (all) -# The network interface addresses that this mail sys- -# tem receives mail on. +# The local network interface addresses that this +# mail system receives mail on. # # proxy_interfaces (empty) -# The network interface addresses that this mail sys- -# tem receives mail on by way of a proxy or network -# address translation unit. +# The remote network interface addresses that this +# mail system receives mail on by way of a proxy or +# network address translation unit. # # mydestination ($myhostname, localhost.$mydomain, local- # host) diff --git a/postfix/conf/header_checks b/postfix/conf/header_checks index bcd96a97a..db295d022 100644 --- a/postfix/conf/header_checks +++ b/postfix/conf/header_checks @@ -440,46 +440,32 @@ # tent-Length:, Return-Path:. # # CONFIGURATION PARAMETERS -# body_checks -# Lookup tables with content filter rules for message -# body lines. These filters see one physical line at -# a time, in chunks of at most $line_length_limit -# bytes. +# body_checks (empty) +# Optional lookup tables for content inspection as +# specified in the body_checks(5) manual page. # -# body_checks_size_limit -# The amount of content per message body segment -# (attachment) that is subjected to $body_checks fil- -# tering. +# body_checks_size_limit (51200) +# How much text in a message body segment (or attach- +# ment, if you prefer to use that term) is subjected +# to body_checks inspection. # -# header_checks +# header_checks (empty) +# Optional lookup tables for content inspection of +# primary non-MIME message headers, as specified in +# the header_checks(5) manual page. # -# mime_header_checks (default: $header_checks) +# mime_header_checks ($header_checks) +# Optional lookup tables for content inspection of +# MIME related message headers, as described in the +# header_checks(5) manual page. # -# nested_header_checks (default: $header_checks) -# Lookup tables with content filter rules for message -# header lines: respectively, these are applied to -# the initial message headers (not including MIME -# headers), to the MIME headers anywhere in the mes- -# sage, and to the initial headers of attached mes- -# sages. +# nested_header_checks ($header_checks) +# Optional lookup tables for content inspection of +# non-MIME message headers in attached messages, as +# described in the header_checks(5) manual page. # -# Note: these filters see one logical message header -# at a time, even when a message header spans multi- -# ple lines. Message headers that are longer than -# $header_size_limit characters are truncated. -# -# disable_mime_input_processing -# While receiving mail, give no special treatment to -# MIME related message headers; all text after the -# initial message headers is considered to be part of -# the message body. This means that header_checks is -# applied to all the initial message headers, and -# that body_checks is applied to the remainder of the -# message. -# -# Note: when used in this manner, body_checks will -# process a multi-line message header one line at a -# time. +# disable_mime_input_processing (no) +# Turn off MIME processing while receiving mail. # # EXAMPLES # Header pattern to block attachments with bad file name diff --git a/postfix/conf/relocated b/postfix/conf/relocated index 90f63ecf2..5c4326672 100644 --- a/postfix/conf/relocated +++ b/postfix/conf/relocated @@ -131,8 +131,8 @@ # Other parameters of interest: # # inet_interfaces (all) -# The network interface addresses that this mail sys- -# tem receives mail on. +# The local network interface addresses that this +# mail system receives mail on. # # mydestination ($myhostname, localhost.$mydomain, local- # host) @@ -145,9 +145,9 @@ # ered to. # # proxy_interfaces (empty) -# The network interface addresses that this mail sys- -# tem receives mail on by way of a proxy or network -# address translation unit. +# The remote network interface addresses that this +# mail system receives mail on by way of a proxy or +# network address translation unit. # # SEE ALSO # trivial-rewrite(8), address resolver diff --git a/postfix/html/aliases.5.html b/postfix/html/aliases.5.html index 5df15e069..79d01b483 100644 --- a/postfix/html/aliases.5.html +++ b/postfix/html/aliases.5.html @@ -149,8 +149,8 @@ ALIASES(5) ALIASES(5) 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. allow_mail_to_commands (alias, forward) Restrict local(8) mail delivery to external commands. diff --git a/postfix/html/canonical.5.html b/postfix/html/canonical.5.html index 75c25f166..d0512977c 100644 --- a/postfix/html/canonical.5.html +++ b/postfix/html/canonical.5.html @@ -211,20 +211,18 @@ CANONICAL(5) CANONICAL(5) Other parameters of interest: inet_interfaces (all) - The network interface addresses that this mail system receives - mail on. + The local network interface addresses that this mail system + receives mail on. local_header_rewrite_clients (permit_inet_interfaces) - Rewrite message header addresses in mail from these clients and - update incomplete addresses with the domain name in $myorigin or - $mydomain; either don't rewrite message headers from other - clients at all, or rewrite message headers and update incomplete - addresses with the domain specified in the remote_header_re- - write_domain parameter. + Rewrite or add message headers in mail from these clients, + updating incomplete addresses with the domain name in $myorigin + or $mydomain, and adding missing headers. proxy_interfaces (empty) - The network interface addresses that this mail system receives - mail on by way of a proxy or network address translation unit. + The remote network interface addresses that this mail system + receives mail on by way of a proxy or network address transla- + tion unit. masquerade_classes (envelope_sender, header_sender, header_recipient) What addresses are subject to address masquerading. @@ -253,9 +251,11 @@ CANONICAL(5) CANONICAL(5) set to "-". remote_header_rewrite_domain (empty) - Don't rewrite message headers from remote clients at all when - this parameter is empty; otherwise, rewrite message headers and - append the specified domain name to incomplete addresses. + Rewrite or add message headers in mail from remote clients if + the remote_header_rewrite_domain parameter value is non-empty, + updating incomplete addresses with the domain specified in the + remote_header_rewrite_domain parameter, and adding missing head- + ers. SEE ALSO cleanup(8), canonicalize and enqueue mail diff --git a/postfix/html/dnsblog.8.html b/postfix/html/dnsblog.8.html index 250b046bf..2028fa167 100644 --- a/postfix/html/dnsblog.8.html +++ b/postfix/html/dnsblog.8.html @@ -49,8 +49,8 @@ DNSBLOG(8) DNSBLOG(8) request before it is terminated by a built-in watchdog timer. postscreen_dnsbl_sites (empty) - Optional list of DNS allow/denylist domains, filters and weight - factors. + Optional list of patterns with DNS allow/denylist domains, fil- + ters and weight factors. ipc_timeout (3600s) The time limit for sending or receiving information over an diff --git a/postfix/html/generic.5.html b/postfix/html/generic.5.html index 813d47e82..c1a8a30e4 100644 --- a/postfix/html/generic.5.html +++ b/postfix/html/generic.5.html @@ -182,25 +182,26 @@ GENERIC(5) GENERIC(5) Other parameters of interest: inet_interfaces (all) - The network interface addresses that this mail system receives - mail on. + The local network interface addresses that this mail system + receives mail on. proxy_interfaces (empty) - The network interface addresses that this mail system receives - mail on by way of a proxy or network address translation unit. + The remote network interface addresses that this mail system + receives mail on by way of a proxy or network address transla- + tion unit. 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 "-". SEE ALSO diff --git a/postfix/html/header_checks.5.html b/postfix/html/header_checks.5.html index 6bb114a1f..c1c8b17cc 100644 --- a/postfix/html/header_checks.5.html +++ b/postfix/html/header_checks.5.html @@ -392,40 +392,31 @@ HEADER_CHECKS(5) HEADER_CHECKS(5) Return-Path:. CONFIGURATION PARAMETERS - body_checks - Lookup tables with content filter rules for message body lines. - These filters see one physical line at a time, in chunks of at - most $line_length_limit bytes. + body_checks (empty) + Optional lookup tables for content inspection as specified in + the body_checks(5) manual page. - body_checks_size_limit - The amount of content per message body segment (attachment) that - is subjected to $body_checks filtering. + body_checks_size_limit (51200) + How much text in a message body segment (or attachment, if you + prefer to use that term) is subjected to body_checks inspection. - header_checks + header_checks (empty) + Optional lookup tables for content inspection of primary + non-MIME message headers, as specified in the header_checks(5) + manual page. - mime_header_checks (default: $header_checks) + mime_header_checks ($header_checks) + Optional lookup tables for content inspection of MIME related + message headers, as described in the header_checks(5) manual + page. - nested_header_checks (default: $header_checks) - Lookup tables with content filter rules for message header - lines: respectively, these are applied to the initial message - headers (not including MIME headers), to the MIME headers any- - where in the message, and to the initial headers of attached - messages. + nested_header_checks ($header_checks) + Optional lookup tables for content inspection of non-MIME mes- + sage headers in attached messages, as described in the + header_checks(5) manual page. - Note: these filters see one logical message header at a time, - even when a message header spans multiple lines. Message headers - that are longer than $header_size_limit characters are trun- - cated. - - disable_mime_input_processing - While receiving mail, give no special treatment to MIME related - message headers; all text after the initial message headers is - considered to be part of the message body. This means that - header_checks is applied to all the initial message headers, and - that body_checks is applied to the remainder of the message. - - Note: when used in this manner, body_checks will process a - multi-line message header one line at a time. + disable_mime_input_processing (no) + Turn off MIME processing while receiving mail. EXAMPLES Header pattern to block attachments with bad file name extensions. For diff --git a/postfix/html/mailq.1.html b/postfix/html/mailq.1.html index bebc17b3f..bf6051d2c 100644 --- a/postfix/html/mailq.1.html +++ b/postfix/html/mailq.1.html @@ -455,9 +455,11 @@ SENDMAIL(1) SENDMAIL(1) The location of the Postfix top-level queue directory. remote_header_rewrite_domain (empty) - Don't rewrite message headers from remote clients at all when - this parameter is empty; otherwise, rewrite message headers and - append the specified domain name to incomplete addresses. + Rewrite or add message headers in mail from remote clients if + the remote_header_rewrite_domain parameter value is non-empty, + updating incomplete addresses with the domain specified in the + remote_header_rewrite_domain parameter, and adding missing head- + ers. syslog_facility (mail) The syslog facility of Postfix logging. diff --git a/postfix/html/newaliases.1.html b/postfix/html/newaliases.1.html index bebc17b3f..bf6051d2c 100644 --- a/postfix/html/newaliases.1.html +++ b/postfix/html/newaliases.1.html @@ -455,9 +455,11 @@ SENDMAIL(1) SENDMAIL(1) The location of the Postfix top-level queue directory. remote_header_rewrite_domain (empty) - Don't rewrite message headers from remote clients at all when - this parameter is empty; otherwise, rewrite message headers and - append the specified domain name to incomplete addresses. + Rewrite or add message headers in mail from remote clients if + the remote_header_rewrite_domain parameter value is non-empty, + updating incomplete addresses with the domain specified in the + remote_header_rewrite_domain parameter, and adding missing head- + ers. syslog_facility (mail) The syslog facility of Postfix logging. diff --git a/postfix/html/postdrop.1.html b/postfix/html/postdrop.1.html index 72a4abfc2..bc4293a37 100644 --- a/postfix/html/postdrop.1.html +++ b/postfix/html/postdrop.1.html @@ -70,7 +70,7 @@ POSTDROP(1) POSTDROP(1) figuration files. import_environment (see 'postconf -d' output) - The list of environment parameters that a privileged Postfix + The list of environment variables that a privileged Postfix process will import from a non-Postfix parent process, or name=value environment overrides. diff --git a/postfix/html/postkick.1.html b/postfix/html/postkick.1.html index 3156fc4a0..9ca7c59f1 100644 --- a/postfix/html/postkick.1.html +++ b/postfix/html/postkick.1.html @@ -63,7 +63,7 @@ POSTKICK(1) POSTKICK(1) the Postfix daemon process input buffer before giving up. import_environment (see 'postconf -d' output) - The list of environment parameters that a privileged Postfix + The list of environment variables that a privileged Postfix process will import from a non-Postfix parent process, or name=value environment overrides. diff --git a/postfix/html/postlock.1.html b/postfix/html/postlock.1.html index 0ca0b57cc..9750f9bc7 100644 --- a/postfix/html/postlock.1.html +++ b/postfix/html/postlock.1.html @@ -93,7 +93,7 @@ POSTLOCK(1) POSTLOCK(1) figuration files. import_environment (see 'postconf -d' output) - The list of environment parameters that a privileged Postfix + The list of environment variables that a privileged Postfix process will import from a non-Postfix parent process, or name=value environment overrides. diff --git a/postfix/html/postsuper.1.html b/postfix/html/postsuper.1.html index 30a524a4d..cf0681adf 100644 --- a/postfix/html/postsuper.1.html +++ b/postfix/html/postsuper.1.html @@ -275,7 +275,7 @@ POSTSUPER(1) POSTSUPER(1) subdirectory levels. import_environment (see 'postconf -d' output) - The list of environment parameters that a privileged Postfix + The list of environment variables that a privileged Postfix process will import from a non-Postfix parent process, or name=value environment overrides. diff --git a/postfix/html/qmgr.8.html b/postfix/html/qmgr.8.html index bfaa05fdb..068b25673 100644 --- a/postfix/html/qmgr.8.html +++ b/postfix/html/qmgr.8.html @@ -232,8 +232,8 @@ QMGR(8) QMGR(8) ter.cf name of the message delivery transport. default_recipient_refill_delay (5s) - The default per-transport maximum delay between recipients - refills. + The default per-transport maximum delay between refilling recip- + ients. transport_recipient_refill_delay ($default_recipient_refill_delay) A transport-specific override for the default_recipi- diff --git a/postfix/html/qmqpd.8.html b/postfix/html/qmqpd.8.html index 9506cfa44..55cbcdcda 100644 --- a/postfix/html/qmqpd.8.html +++ b/postfix/html/qmqpd.8.html @@ -61,7 +61,7 @@ QMQPD(8) QMQPD(8) smtputf8_enable (yes) Enable preliminary SMTPUTF8 support for the protocols described - in RFC 6531..6533. + in RFC 6531, RFC 6532, and RFC 6533. smtputf8_autodetect_classes (sendmail, verify) Detect that a message requires SMTPUTF8 support for the speci- diff --git a/postfix/html/relocated.5.html b/postfix/html/relocated.5.html index efd2f53ad..62a580a61 100644 --- a/postfix/html/relocated.5.html +++ b/postfix/html/relocated.5.html @@ -125,8 +125,8 @@ RELOCATED(5) RELOCATED(5) Other parameters of interest: inet_interfaces (all) - The network interface addresses that this mail system receives - mail on. + The local 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 @@ -137,8 +137,9 @@ RELOCATED(5) RELOCATED(5) and that locally posted mail is delivered to. proxy_interfaces (empty) - The network interface addresses that this mail system receives - mail on by way of a proxy or network address translation unit. + The remote network interface addresses that this mail system + receives mail on by way of a proxy or network address transla- + tion unit. SEE ALSO trivial-rewrite(8), address resolver diff --git a/postfix/html/sendmail.1.html b/postfix/html/sendmail.1.html index bebc17b3f..bf6051d2c 100644 --- a/postfix/html/sendmail.1.html +++ b/postfix/html/sendmail.1.html @@ -455,9 +455,11 @@ SENDMAIL(1) SENDMAIL(1) The location of the Postfix top-level queue directory. remote_header_rewrite_domain (empty) - Don't rewrite message headers from remote clients at all when - this parameter is empty; otherwise, rewrite message headers and - append the specified domain name to incomplete addresses. + Rewrite or add message headers in mail from remote clients if + the remote_header_rewrite_domain parameter value is non-empty, + updating incomplete addresses with the domain specified in the + remote_header_rewrite_domain parameter, and adding missing head- + ers. syslog_facility (mail) The syslog facility of Postfix logging. diff --git a/postfix/html/trivial-rewrite.8.html b/postfix/html/trivial-rewrite.8.html index 1bcd8e7d5..7b1e3e355 100644 --- a/postfix/html/trivial-rewrite.8.html +++ b/postfix/html/trivial-rewrite.8.html @@ -134,9 +134,11 @@ TRIVIAL-REWRITE(8) TRIVIAL-REWRITE(8) Available in Postfix 2.2 and later: remote_header_rewrite_domain (empty) - Don't rewrite message headers from remote clients at all when - this parameter is empty; otherwise, rewrite message headers and - append the specified domain name to incomplete addresses. + Rewrite or add message headers in mail from remote clients if + the remote_header_rewrite_domain parameter value is non-empty, + updating incomplete addresses with the domain specified in the + remote_header_rewrite_domain parameter, and adding missing head- + ers. ROUTING CONTROLS The following is applicable to Postfix version 2.0 and later. Earlier @@ -155,13 +157,14 @@ TRIVIAL-REWRITE(8) TRIVIAL-REWRITE(8) relay_transport (relay) The default mail delivery transport and next-hop destination for - remote delivery to domains listed with $relay_domains. + the relay domain address class: recipient domains that match + $relay_domains. default_transport (smtp) The default mail delivery transport and next-hop destination for - destinations that do not match $mydestination, $inet_interfaces, - $proxy_interfaces, $virtual_alias_domains, $virtual_mail- - box_domains, or $relay_domains. + the default domain class: recipient domains that do not match + $mydestination, $inet_interfaces, $proxy_interfaces, $vir- + tual_alias_domains, $virtual_mailbox_domains, or $relay_domains. parent_domain_matches_subdomains (see 'postconf -d' output) A list of Postfix features where the pattern "example.com" also @@ -169,8 +172,8 @@ TRIVIAL-REWRITE(8) TRIVIAL-REWRITE(8) explicit ".example.com" pattern. relayhost (empty) - The next-hop destination(s) for non-local mail; overrides - non-local domains in recipient addresses. + The next-hop destination(s) for non-local mail; takes precedence + over non-local domains in recipient addresses. transport_maps (empty) Optional lookup tables with mappings from recipient address to diff --git a/postfix/man/man1/postdrop.1 b/postfix/man/man1/postdrop.1 index 23d60124a..9dffd688e 100644 --- a/postfix/man/man1/postdrop.1 +++ b/postfix/man/man1/postdrop.1 @@ -78,7 +78,7 @@ environment parameter. The default location of the Postfix main.cf and master.cf configuration files. .IP "\fBimport_environment (see 'postconf -d' output)\fR" -The list of environment parameters that a privileged Postfix +The list of environment variables that a privileged Postfix process will import from a non\-Postfix parent process, or name=value environment overrides. .IP "\fBqueue_directory (see 'postconf -d' output)\fR" diff --git a/postfix/man/man1/postkick.1 b/postfix/man/man1/postkick.1 index 6cd0ef655..779a35344 100644 --- a/postfix/man/man1/postkick.1 +++ b/postfix/man/man1/postkick.1 @@ -66,7 +66,7 @@ configuration files. How long the \fBpostkick\fR(1) command waits for a request to enter the Postfix daemon process input buffer before giving up. .IP "\fBimport_environment (see 'postconf -d' output)\fR" -The list of environment parameters that a privileged Postfix +The list of environment variables that a privileged Postfix process will import from a non\-Postfix parent process, or name=value environment overrides. .IP "\fBqueue_directory (see 'postconf -d' output)\fR" diff --git a/postfix/man/man1/postlock.1 b/postfix/man/man1/postlock.1 index cd468e7c2..6c07319bf 100644 --- a/postfix/man/man1/postlock.1 +++ b/postfix/man/man1/postlock.1 @@ -99,7 +99,7 @@ The delay between attempts to fork() a child process. The default location of the Postfix main.cf and master.cf configuration files. .IP "\fBimport_environment (see 'postconf -d' output)\fR" -The list of environment parameters that a privileged Postfix +The list of environment variables that a privileged Postfix process will import from a non\-Postfix parent process, or name=value environment overrides. .SH "SEE ALSO" diff --git a/postfix/man/man1/postsuper.1 b/postfix/man/man1/postsuper.1 index 885330f1d..8c5da034d 100644 --- a/postfix/man/man1/postsuper.1 +++ b/postfix/man/man1/postsuper.1 @@ -46,7 +46,7 @@ from standard input. For example, to delete all mail with exactly one recipient \fBuser@example.com\fR: .sp .nf -postqueue \-j | jq -r ' +postqueue \-j | jq \-r ' # See JSON OBJECT FORMAT section in the postqueue(1) manpage select(.recipients[0].address == "user@example.com") | select(.recipients[1].address == null) @@ -54,7 +54,7 @@ postqueue \-j | jq -r ' ' | postsuper \-d \- .fi .sp -(note the "jq -r" option), or the historical form: +(note the "jq \-r" option), or the historical form: .sp .nf mailq | tail \-n +2 | grep \-v '^ *(' | awk 'BEGIN { RS = "" } @@ -302,7 +302,7 @@ the hash_queue_names parameter. The names of queue directories that are split across multiple subdirectory levels. .IP "\fBimport_environment (see 'postconf -d' output)\fR" -The list of environment parameters that a privileged Postfix +The list of environment variables that a privileged Postfix process will import from a non\-Postfix parent process, or name=value environment overrides. .IP "\fBqueue_directory (see 'postconf -d' output)\fR" diff --git a/postfix/man/man1/sendmail.1 b/postfix/man/man1/sendmail.1 index 22affe637..e3bc7a639 100644 --- a/postfix/man/man1/sendmail.1 +++ b/postfix/man/man1/sendmail.1 @@ -440,9 +440,10 @@ daemon processes. .IP "\fBqueue_directory (see 'postconf -d' output)\fR" The location of the Postfix top\-level queue directory. .IP "\fBremote_header_rewrite_domain (empty)\fR" -Don't rewrite message headers from remote clients at all when -this parameter is empty; otherwise, rewrite message headers and -append the specified domain name to incomplete addresses. +Rewrite or add message headers in mail from remote clients if +the remote_header_rewrite_domain parameter value is non\-empty, +updating incomplete addresses with the domain specified in the +remote_header_rewrite_domain parameter, and adding missing headers. .IP "\fBsyslog_facility (mail)\fR" The syslog facility of Postfix logging. .IP "\fBsyslog_name (see 'postconf -d' output)\fR" diff --git a/postfix/man/man5/aliases.5 b/postfix/man/man5/aliases.5 index 46c47420c..ed6a10fd1 100644 --- a/postfix/man/man5/aliases.5 +++ b/postfix/man/man5/aliases.5 @@ -170,8 +170,8 @@ The alias databases for \fBlocal\fR(8) delivery that are updated with "\fBnewaliases\fR" or with "\fBsendmail \-bi\fR". .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 "\fBallow_mail_to_commands (alias, forward)\fR" Restrict \fBlocal\fR(8) mail delivery to external commands. .IP "\fBallow_mail_to_files (alias, forward)\fR" diff --git a/postfix/man/man5/canonical.5 b/postfix/man/man5/canonical.5 index e9876643b..8776f3b7d 100644 --- a/postfix/man/man5/canonical.5 +++ b/postfix/man/man5/canonical.5 @@ -231,17 +231,14 @@ key to the lookup result. .PP Other parameters of interest: .IP "\fBinet_interfaces (all)\fR" -The network interface addresses that this mail system receives -mail on. +The local network interface addresses that this mail system +receives mail on. .IP "\fBlocal_header_rewrite_clients (permit_inet_interfaces)\fR" -Rewrite message header addresses in mail from these clients and -update incomplete addresses with the domain name in $myorigin or -$mydomain; either don't rewrite message headers from other clients -at all, or rewrite message headers and update incomplete addresses -with the domain specified in the remote_header_rewrite_domain -parameter. +Rewrite or add message headers in mail from these clients, +updating incomplete addresses with the domain name in $myorigin or +$mydomain, and adding missing headers. .IP "\fBproxy_interfaces (empty)\fR" -The network interface addresses that this mail system receives mail +The remote network interface addresses that this mail system receives mail on by way of a proxy or network address translation unit. .IP "\fBmasquerade_classes (envelope_sender, header_sender, header_recipient)\fR" What addresses are subject to address masquerading. @@ -263,9 +260,10 @@ Enable special treatment for owner\-\fIlistname\fR entries in the \fIlistname\fR\-request address localparts when the recipient_delimiter is set to "\-". .IP "\fBremote_header_rewrite_domain (empty)\fR" -Don't rewrite message headers from remote clients at all when -this parameter is empty; otherwise, rewrite message headers and -append the specified domain name to incomplete addresses. +Rewrite or add message headers in mail from remote clients if +the remote_header_rewrite_domain parameter value is non\-empty, +updating incomplete addresses with the domain specified in the +remote_header_rewrite_domain parameter, and adding missing headers. .SH "SEE ALSO" .na .nf diff --git a/postfix/man/man5/generic.5 b/postfix/man/man5/generic.5 index 6e891eb84..b47453031 100644 --- a/postfix/man/man5/generic.5 +++ b/postfix/man/man5/generic.5 @@ -214,10 +214,10 @@ key to the lookup result. .PP Other parameters of interest: .IP "\fBinet_interfaces (all)\fR" -The 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 network interface addresses that this mail system receives mail +The remote network interface addresses that this mail system receives mail on by way of a proxy or network address translation unit. .IP "\fBmydestination ($myhostname, localhost.$mydomain, localhost)\fR" The list of domains that are delivered via the $local_transport diff --git a/postfix/man/man5/header_checks.5 b/postfix/man/man5/header_checks.5 index 31ac7dcaf..92c1de95e 100644 --- a/postfix/man/man5/header_checks.5 +++ b/postfix/man/man5/header_checks.5 @@ -417,34 +417,24 @@ be examined before they are deleted. Examples are: \fBBcc:\fR, .nf .ad .fi -.IP \fBbody_checks\fR -Lookup tables with content filter rules for message body lines. -These filters see one physical line at a time, in chunks of -at most \fB$line_length_limit\fR bytes. -.IP \fBbody_checks_size_limit\fP -The amount of content per message body segment (attachment) that is -subjected to \fB$body_checks\fR filtering. -.IP \fBheader_checks\fR -.IP "\fBmime_header_checks\fR (default: \fB$header_checks\fR)" -.IP "\fBnested_header_checks\fR (default: \fB$header_checks\fR)" -Lookup tables with content filter rules for message header lines: -respectively, these are applied to the initial message headers -(not including MIME headers), to the MIME headers anywhere in -the message, and to the initial headers of attached messages. -.sp -Note: these filters see one logical message header at a time, even -when a message header spans multiple lines. Message headers that -are longer than \fB$header_size_limit\fR characters are truncated. -.IP \fBdisable_mime_input_processing\fR -While receiving mail, give no special treatment to MIME related -message headers; all text after the initial message headers is -considered to be part of the message body. This means that -\fBheader_checks\fR is applied to all the initial message headers, -and that \fBbody_checks\fR is applied to the remainder of the -message. -.sp -Note: when used in this manner, \fBbody_checks\fR will process -a multi\-line message header one line at a time. +.IP "\fBbody_checks (empty)\fR" +Optional lookup tables for content inspection as specified in +the \fBbody_checks\fR(5) manual page. +.IP "\fBbody_checks_size_limit (51200)\fR" +How much text in a message body segment (or attachment, if you +prefer to use that term) is subjected to body_checks inspection. +.IP "\fBheader_checks (empty)\fR" +Optional lookup tables for content inspection of primary non\-MIME +message headers, as specified in the \fBheader_checks\fR(5) manual page. +.IP "\fBmime_header_checks ($header_checks)\fR" +Optional lookup tables for content inspection of MIME related +message headers, as described in the \fBheader_checks\fR(5) manual page. +.IP "\fBnested_header_checks ($header_checks)\fR" +Optional lookup tables for content inspection of non\-MIME message +headers in attached messages, as described in the \fBheader_checks\fR(5) +manual page. +.IP "\fBdisable_mime_input_processing (no)\fR" +Turn off MIME processing while receiving mail. .SH "EXAMPLES" .na .nf diff --git a/postfix/man/man5/relocated.5 b/postfix/man/man5/relocated.5 index fbc85a391..e1d7863b4 100644 --- a/postfix/man/man5/relocated.5 +++ b/postfix/man/man5/relocated.5 @@ -147,8 +147,8 @@ domains that no longer exist. .PP Other parameters of interest: .IP "\fBinet_interfaces (all)\fR" -The 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. @@ -156,7 +156,7 @@ mail delivery transport. The domain name that locally\-posted mail appears to come from, and that locally posted mail is delivered to. .IP "\fBproxy_interfaces (empty)\fR" -The network interface addresses that this mail system receives mail +The remote network interface addresses that this mail system receives mail on by way of a proxy or network address translation unit. .SH "SEE ALSO" .na diff --git a/postfix/man/man8/dnsblog.8 b/postfix/man/man8/dnsblog.8 index bf555489e..6c6cef3dd 100644 --- a/postfix/man/man8/dnsblog.8 +++ b/postfix/man/man8/dnsblog.8 @@ -55,7 +55,8 @@ configuration files. How much time a Postfix daemon process may take to handle a request before it is terminated by a built\-in watchdog timer. .IP "\fBpostscreen_dnsbl_sites (empty)\fR" -Optional list of DNS allow/denylist domains, filters and weight +Optional list of patterns with DNS allow/denylist domains, filters +and weight factors. .IP "\fBipc_timeout (3600s)\fR" The time limit for sending or receiving information over an internal diff --git a/postfix/man/man8/qmgr.8 b/postfix/man/man8/qmgr.8 index a24af7196..ca1fd4c79 100644 --- a/postfix/man/man8/qmgr.8 +++ b/postfix/man/man8/qmgr.8 @@ -234,7 +234,7 @@ A transport\-specific override for the default_recipient_refill_limit parameter value, where \fItransport\fR is the master.cf name of the message delivery transport. .IP "\fBdefault_recipient_refill_delay (5s)\fR" -The default per\-transport maximum delay between recipients refills. +The default per\-transport maximum delay between refilling recipients. .IP "\fBtransport_recipient_refill_delay ($default_recipient_refill_delay)\fR" A transport\-specific override for the default_recipient_refill_delay parameter value, where \fItransport\fR is the master.cf name of diff --git a/postfix/man/man8/qmqpd.8 b/postfix/man/man8/qmqpd.8 index 9ee62675f..0f0a82bc7 100644 --- a/postfix/man/man8/qmqpd.8 +++ b/postfix/man/man8/qmqpd.8 @@ -75,7 +75,7 @@ filtering, or address mapping. Preliminary SMTPUTF8 support is introduced with Postfix 3.0. .IP "\fBsmtputf8_enable (yes)\fR" Enable preliminary SMTPUTF8 support for the protocols described -in RFC 6531..6533. +in RFC 6531, RFC 6532, and RFC 6533. .IP "\fBsmtputf8_autodetect_classes (sendmail, verify)\fR" Detect that a message requires SMTPUTF8 support for the specified mail origin classes. diff --git a/postfix/man/man8/trivial-rewrite.8 b/postfix/man/man8/trivial-rewrite.8 index e41da7190..f2c39fb80 100644 --- a/postfix/man/man8/trivial-rewrite.8 +++ b/postfix/man/man8/trivial-rewrite.8 @@ -142,9 +142,10 @@ Enable the rewriting of "site!user" into "user@site". .PP Available in Postfix 2.2 and later: .IP "\fBremote_header_rewrite_domain (empty)\fR" -Don't rewrite message headers from remote clients at all when -this parameter is empty; otherwise, rewrite message headers and -append the specified domain name to incomplete addresses. +Rewrite or add message headers in mail from remote clients if +the remote_header_rewrite_domain parameter value is non\-empty, +updating incomplete addresses with the domain specified in the +remote_header_rewrite_domain parameter, and adding missing headers. .SH "ROUTING CONTROLS" .na .nf @@ -163,10 +164,12 @@ The default mail delivery transport and next\-hop destination for final delivery to domains listed with $virtual_mailbox_domains. .IP "\fBrelay_transport (relay)\fR" The default mail delivery transport and next\-hop destination for -remote delivery to domains listed with $relay_domains. +the relay domain address class: recipient domains that match +$relay_domains. .IP "\fBdefault_transport (smtp)\fR" The default mail delivery transport and next\-hop destination for -destinations that do not match $mydestination, $inet_interfaces, +the default domain class: recipient domains that do not match +$mydestination, $inet_interfaces, $proxy_interfaces, $virtual_alias_domains, $virtual_mailbox_domains, or $relay_domains. .IP "\fBparent_domain_matches_subdomains (see 'postconf -d' output)\fR" @@ -174,8 +177,8 @@ A list of Postfix features where the pattern "example.com" also matches subdomains of example.com, instead of requiring an explicit ".example.com" pattern. .IP "\fBrelayhost (empty)\fR" -The next\-hop destination(s) for non\-local mail; overrides non\-local -domains in recipient addresses. +The next\-hop destination(s) for non\-local mail; takes precedence +over non\-local domains in recipient addresses. .IP "\fBtransport_maps (empty)\fR" Optional lookup tables with mappings from recipient address to (message delivery transport, next\-hop destination). diff --git a/postfix/proto/aliases b/postfix/proto/aliases index 1f6a0ed29..f48a00b1e 100644 --- a/postfix/proto/aliases +++ b/postfix/proto/aliases @@ -154,8 +154,8 @@ # "\fBnewaliases\fR" or with "\fBsendmail -bi\fR". # .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 "\fBallow_mail_to_commands (alias, forward)\fR" # Restrict \fBlocal\fR(8) mail delivery to external commands. # .IP "\fBallow_mail_to_files (alias, forward)\fR" diff --git a/postfix/proto/canonical b/postfix/proto/canonical index 6364d3e1d..5ffc8d181 100644 --- a/postfix/proto/canonical +++ b/postfix/proto/canonical @@ -207,17 +207,14 @@ # .PP # Other parameters of interest: # .IP "\fBinet_interfaces (all)\fR" -# The network interface addresses that this mail system receives -# mail on. +# The local network interface addresses that this mail system +# receives mail on. # .IP "\fBlocal_header_rewrite_clients (permit_inet_interfaces)\fR" -# Rewrite message header addresses in mail from these clients and -# update incomplete addresses with the domain name in $myorigin or -# $mydomain; either don't rewrite message headers from other clients -# at all, or rewrite message headers and update incomplete addresses -# with the domain specified in the remote_header_rewrite_domain -# parameter. +# Rewrite or add message headers in mail from these clients, +# updating incomplete addresses with the domain name in $myorigin or +# $mydomain, and adding missing headers. # .IP "\fBproxy_interfaces (empty)\fR" -# The network interface addresses that this mail system receives mail +# The remote network interface addresses that this mail system receives mail # on by way of a proxy or network address translation unit. # .IP "\fBmasquerade_classes (envelope_sender, header_sender, header_recipient)\fR" # What addresses are subject to address masquerading. @@ -239,9 +236,10 @@ # \fIlistname\fR-request address localparts when the recipient_delimiter # is set to "-". # .IP "\fBremote_header_rewrite_domain (empty)\fR" -# Don't rewrite message headers from remote clients at all when -# this parameter is empty; otherwise, rewrite message headers and -# append the specified domain name to incomplete addresses. +# Rewrite or add message headers in mail from remote clients if +# the remote_header_rewrite_domain parameter value is non-empty, +# updating incomplete addresses with the domain specified in the +# remote_header_rewrite_domain parameter, and adding missing headers. # SEE ALSO # cleanup(8), canonicalize and enqueue mail # postmap(1), Postfix lookup table manager diff --git a/postfix/proto/generic b/postfix/proto/generic index fdeb1eac5..dc0ad4177 100644 --- a/postfix/proto/generic +++ b/postfix/proto/generic @@ -188,10 +188,10 @@ # .PP # Other parameters of interest: # .IP "\fBinet_interfaces (all)\fR" -# The 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 network interface addresses that this mail system receives mail +# The remote network interface addresses that this mail system receives mail # on by way of a proxy or network address translation unit. # .IP "\fBmydestination ($myhostname, localhost.$mydomain, localhost)\fR" # The list of domains that are delivered via the $local_transport diff --git a/postfix/proto/header_checks b/postfix/proto/header_checks index 1aa6f5a71..9a6b55c8b 100644 --- a/postfix/proto/header_checks +++ b/postfix/proto/header_checks @@ -418,34 +418,24 @@ # CONFIGURATION PARAMETERS # .ad # .fi -# .IP \fBbody_checks\fR -# Lookup tables with content filter rules for message body lines. -# These filters see one physical line at a time, in chunks of -# at most \fB$line_length_limit\fR bytes. -# .IP \fBbody_checks_size_limit\fP -# The amount of content per message body segment (attachment) that is -# subjected to \fB$body_checks\fR filtering. -# .IP \fBheader_checks\fR -# .IP "\fBmime_header_checks\fR (default: \fB$header_checks\fR)" -# .IP "\fBnested_header_checks\fR (default: \fB$header_checks\fR)" -# Lookup tables with content filter rules for message header lines: -# respectively, these are applied to the initial message headers -# (not including MIME headers), to the MIME headers anywhere in -# the message, and to the initial headers of attached messages. -# .sp -# Note: these filters see one logical message header at a time, even -# when a message header spans multiple lines. Message headers that -# are longer than \fB$header_size_limit\fR characters are truncated. -# .IP \fBdisable_mime_input_processing\fR -# While receiving mail, give no special treatment to MIME related -# message headers; all text after the initial message headers is -# considered to be part of the message body. This means that -# \fBheader_checks\fR is applied to all the initial message headers, -# and that \fBbody_checks\fR is applied to the remainder of the -# message. -# .sp -# Note: when used in this manner, \fBbody_checks\fR will process -# a multi-line message header one line at a time. +# .IP "\fBbody_checks (empty)\fR" +# Optional lookup tables for content inspection as specified in +# the \fBbody_checks\fR(5) manual page. +# .IP "\fBbody_checks_size_limit (51200)\fR" +# How much text in a message body segment (or attachment, if you +# prefer to use that term) is subjected to body_checks inspection. +# .IP "\fBheader_checks (empty)\fR" +# Optional lookup tables for content inspection of primary non-MIME +# message headers, as specified in the \fBheader_checks\fR(5) manual page. +# .IP "\fBmime_header_checks ($header_checks)\fR" +# Optional lookup tables for content inspection of MIME related +# message headers, as described in the \fBheader_checks\fR(5) manual page. +# .IP "\fBnested_header_checks ($header_checks)\fR" +# Optional lookup tables for content inspection of non-MIME message +# headers in attached messages, as described in the \fBheader_checks\fR(5) +# manual page. +# .IP "\fBdisable_mime_input_processing (no)\fR" +# Turn off MIME processing while receiving mail. # EXAMPLES # .ad # .fi diff --git a/postfix/proto/relocated b/postfix/proto/relocated index a0a54cadf..b517b354f 100644 --- a/postfix/proto/relocated +++ b/postfix/proto/relocated @@ -125,8 +125,8 @@ # .PP # Other parameters of interest: # .IP "\fBinet_interfaces (all)\fR" -# The 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. @@ -134,7 +134,7 @@ # The domain name that locally-posted mail appears to come # from, and that locally posted mail is delivered to. # .IP "\fBproxy_interfaces (empty)\fR" -# The network interface addresses that this mail system receives mail +# The remote network interface addresses that this mail system receives mail # on by way of a proxy or network address translation unit. # SEE ALSO # trivial-rewrite(8), address resolver diff --git a/postfix/src/dnsblog/dnsblog.c b/postfix/src/dnsblog/dnsblog.c index bc87c4b59..7a4a4460f 100644 --- a/postfix/src/dnsblog/dnsblog.c +++ b/postfix/src/dnsblog/dnsblog.c @@ -43,7 +43,8 @@ /* How much time a Postfix daemon process may take to handle a /* request before it is terminated by a built-in watchdog timer. /* .IP "\fBpostscreen_dnsbl_sites (empty)\fR" -/* Optional list of DNS allow/denylist domains, filters and weight +/* Optional list of patterns with DNS allow/denylist domains, filters +/* and weight /* factors. /* .IP "\fBipc_timeout (3600s)\fR" /* The time limit for sending or receiving information over an internal diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h index 82ffec738..63d89a723 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 "20240124" +#define MAIL_RELEASE_DATE "20240125" #define MAIL_VERSION_NUMBER "3.9" #ifdef SNAPSHOT diff --git a/postfix/src/postdrop/postdrop.c b/postfix/src/postdrop/postdrop.c index e9335e99a..66c9ea585 100644 --- a/postfix/src/postdrop/postdrop.c +++ b/postfix/src/postdrop/postdrop.c @@ -64,7 +64,7 @@ /* The default location of the Postfix main.cf and master.cf /* configuration files. /* .IP "\fBimport_environment (see 'postconf -d' output)\fR" -/* The list of environment parameters that a privileged Postfix +/* The list of environment variables that a privileged Postfix /* process will import from a non-Postfix parent process, or name=value /* environment overrides. /* .IP "\fBqueue_directory (see 'postconf -d' output)\fR" diff --git a/postfix/src/postkick/postkick.c b/postfix/src/postkick/postkick.c index 6bf924552..a1ce55c70 100644 --- a/postfix/src/postkick/postkick.c +++ b/postfix/src/postkick/postkick.c @@ -54,7 +54,7 @@ /* How long the \fBpostkick\fR(1) command waits for a request to enter the /* Postfix daemon process input buffer before giving up. /* .IP "\fBimport_environment (see 'postconf -d' output)\fR" -/* The list of environment parameters that a privileged Postfix +/* The list of environment variables that a privileged Postfix /* process will import from a non-Postfix parent process, or name=value /* environment overrides. /* .IP "\fBqueue_directory (see 'postconf -d' output)\fR" diff --git a/postfix/src/postlock/postlock.c b/postfix/src/postlock/postlock.c index a05d11ed6..972577be1 100644 --- a/postfix/src/postlock/postlock.c +++ b/postfix/src/postlock/postlock.c @@ -79,7 +79,7 @@ /* The default location of the Postfix main.cf and master.cf /* configuration files. /* .IP "\fBimport_environment (see 'postconf -d' output)\fR" -/* The list of environment parameters that a privileged Postfix +/* The list of environment variables that a privileged Postfix /* process will import from a non-Postfix parent process, or name=value /* environment overrides. /* SEE ALSO diff --git a/postfix/src/postsuper/postsuper.c b/postfix/src/postsuper/postsuper.c index d3f2d5bcd..c9b8e38c6 100644 --- a/postfix/src/postsuper/postsuper.c +++ b/postfix/src/postsuper/postsuper.c @@ -288,7 +288,7 @@ /* The names of queue directories that are split across multiple /* subdirectory levels. /* .IP "\fBimport_environment (see 'postconf -d' output)\fR" -/* The list of environment parameters that a privileged Postfix +/* The list of environment variables that a privileged Postfix /* process will import from a non-Postfix parent process, or name=value /* environment overrides. /* .IP "\fBqueue_directory (see 'postconf -d' output)\fR" diff --git a/postfix/src/qmgr/qmgr.c b/postfix/src/qmgr/qmgr.c index 9d90a6ec9..25168e482 100644 --- a/postfix/src/qmgr/qmgr.c +++ b/postfix/src/qmgr/qmgr.c @@ -206,7 +206,7 @@ /* parameter value, where \fItransport\fR is the master.cf name of /* the message delivery transport. /* .IP "\fBdefault_recipient_refill_delay (5s)\fR" -/* The default per-transport maximum delay between recipients refills. +/* The default per-transport maximum delay between refilling recipients. /* .IP "\fBtransport_recipient_refill_delay ($default_recipient_refill_delay)\fR" /* A transport-specific override for the default_recipient_refill_delay /* parameter value, where \fItransport\fR is the master.cf name of diff --git a/postfix/src/qmqpd/qmqpd.c b/postfix/src/qmqpd/qmqpd.c index d94d33dc7..138ac64c9 100644 --- a/postfix/src/qmqpd/qmqpd.c +++ b/postfix/src/qmqpd/qmqpd.c @@ -57,7 +57,7 @@ /* Preliminary SMTPUTF8 support is introduced with Postfix 3.0. /* .IP "\fBsmtputf8_enable (yes)\fR" /* Enable preliminary SMTPUTF8 support for the protocols described -/* in RFC 6531..6533. +/* in RFC 6531, RFC 6532, and RFC 6533. /* .IP "\fBsmtputf8_autodetect_classes (sendmail, verify)\fR" /* Detect that a message requires SMTPUTF8 support for the specified /* mail origin classes. diff --git a/postfix/src/sendmail/sendmail.c b/postfix/src/sendmail/sendmail.c index 27b354345..df052c5b0 100644 --- a/postfix/src/sendmail/sendmail.c +++ b/postfix/src/sendmail/sendmail.c @@ -412,9 +412,10 @@ /* .IP "\fBqueue_directory (see 'postconf -d' output)\fR" /* The location of the Postfix top-level queue directory. /* .IP "\fBremote_header_rewrite_domain (empty)\fR" -/* Don't rewrite message headers from remote clients at all when -/* this parameter is empty; otherwise, rewrite message headers and -/* append the specified domain name to incomplete addresses. +/* Rewrite or add message headers in mail from remote clients if +/* the remote_header_rewrite_domain parameter value is non-empty, +/* updating incomplete addresses with the domain specified in the +/* remote_header_rewrite_domain parameter, and adding missing headers. /* .IP "\fBsyslog_facility (mail)\fR" /* The syslog facility of Postfix logging. /* .IP "\fBsyslog_name (see 'postconf -d' output)\fR" diff --git a/postfix/src/tlsmgr/tlsmgr.c b/postfix/src/tlsmgr/tlsmgr.c index b58636836..d32e63d4b 100644 --- a/postfix/src/tlsmgr/tlsmgr.c +++ b/postfix/src/tlsmgr/tlsmgr.c @@ -818,6 +818,23 @@ static void tlsmgr_service(VSTREAM *client_stream, char *unused_service, } } + /* + * Workaround: some OS lies under load. It tells the Postfix event + * handler that a server socket is readable, then it tells peekfd() that + * the socket has unread data, and then it tells vstring_get_null() that + * there is none, causing Postfix to spam the log with warning messages. + * Close the stream to stop such nonsense; the client can reconnect if it + * still wants to talk to us. + * + * XXX Why is this problem not reported for the other five + * multi_server-based Postfix services? + */ + else if (vstream_ferror(client_stream) || vstream_feof(client_stream)) { + multi_server_disconnect(client_stream); + return; + /* Note: client_stream is now a dangling pointer. */ + } + /* * Protocol error. */ @@ -827,21 +844,6 @@ static void tlsmgr_service(VSTREAM *client_stream, char *unused_service, ATTR_TYPE_END); } vstream_fflush(client_stream); - - /* - * Reportedly, some OS lies under load; it tells the Postfix event - * handler that a server socket is readable, then it tells peekfd() that - * the socket has pending data, and then it tells vstring_get_null() that - * there is none, causing Postfix to spam the log with warning messages. - * Close the stream to stop such nonsense; the client can reconnect if it - * still wants to talk to us. - * - * XXX Why is this problem not reported for the other five - * multi_server-based Postfix services? - */ - if (vstream_ferror(client_stream) || vstream_feof(client_stream)) - multi_server_disconnect(client_stream); - /* Note: client_stream is now a dangling pointer. */ } /* tlsmgr_pre_init - pre-jail initialization */ diff --git a/postfix/src/trivial-rewrite/trivial-rewrite.c b/postfix/src/trivial-rewrite/trivial-rewrite.c index 675af80f8..bb8da091d 100644 --- a/postfix/src/trivial-rewrite/trivial-rewrite.c +++ b/postfix/src/trivial-rewrite/trivial-rewrite.c @@ -122,9 +122,10 @@ /* .PP /* Available in Postfix 2.2 and later: /* .IP "\fBremote_header_rewrite_domain (empty)\fR" -/* Don't rewrite message headers from remote clients at all when -/* this parameter is empty; otherwise, rewrite message headers and -/* append the specified domain name to incomplete addresses. +/* Rewrite or add message headers in mail from remote clients if +/* the remote_header_rewrite_domain parameter value is non-empty, +/* updating incomplete addresses with the domain specified in the +/* remote_header_rewrite_domain parameter, and adding missing headers. /* ROUTING CONTROLS /* .ad /* .fi @@ -141,10 +142,12 @@ /* final delivery to domains listed with $virtual_mailbox_domains. /* .IP "\fBrelay_transport (relay)\fR" /* The default mail delivery transport and next-hop destination for -/* remote delivery to domains listed with $relay_domains. +/* the relay domain address class: recipient domains that match +/* $relay_domains. /* .IP "\fBdefault_transport (smtp)\fR" /* The default mail delivery transport and next-hop destination for -/* destinations that do not match $mydestination, $inet_interfaces, +/* the default domain class: recipient domains that do not match +/* $mydestination, $inet_interfaces, /* $proxy_interfaces, $virtual_alias_domains, $virtual_mailbox_domains, /* or $relay_domains. /* .IP "\fBparent_domain_matches_subdomains (see 'postconf -d' output)\fR" @@ -152,8 +155,8 @@ /* matches subdomains of example.com, /* instead of requiring an explicit ".example.com" pattern. /* .IP "\fBrelayhost (empty)\fR" -/* The next-hop destination(s) for non-local mail; overrides non-local -/* domains in recipient addresses. +/* The next-hop destination(s) for non-local mail; takes precedence +/* over non-local domains in recipient addresses. /* .IP "\fBtransport_maps (empty)\fR" /* Optional lookup tables with mappings from recipient address to /* (message delivery transport, next-hop destination).