Merging upstream version 3.9.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

12 files changed, 73 insertions, 28 deletions

diff --git a/man/man1/makedefs.1 b/man/man1/makedefs.1
index 70c848e..c921ac2 100644
--- a/man/man1/makedefs.1
+++ b/man/man1/makedefs.1
@@ -38,6 +38,7 @@ of the make(1) command.
 Specifies one or more non\-default object libraries. Postfix
 3.0 and later specify some of their database library
 dependencies with AUXLIBS_CDB, AUXLIBS_LDAP, AUXLIBS_LMDB,
+AUXLIBS_MONGODB,
 AUXLIBS_MYSQL, AUXLIBS_PCRE, AUXLIBS_PGSQL, AUXLIBS_SDBM,
 and AUXLIBS_SQLITE, respectively.
 .IP \fBCC=\fIcompiler_command\fR
diff --git a/man/man1/postcat.1 b/man/man1/postcat.1
index eb3025b..f6541eb 100644
--- a/man/man1/postcat.1
+++ b/man/man1/postcat.1
@@ -88,7 +88,7 @@ The text below provides only a parameter summary. See
 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/man/man1/postconf.1 b/man/man1/postconf.1
index e422429..4121806 100644
--- a/man/man1/postconf.1
+++ b/man/man1/postconf.1
@@ -12,7 +12,7 @@ Postfix configuration utility
 .ti -4
 \fBManaging main.cf:\fR
 
-\fBpostconf\fR [\fB\-dfhHnopvx\fR] [\fB\-c \fIconfig_dir\fR]
+\fBpostconf\fR [\fB\-dfhHnopqvx\fR] [\fB\-c \fIconfig_dir\fR]
 [\fB\-C \fIclass,...\fR] [\fIparameter ...\fR]
 
 \fBpostconf\fR [\fB\-epv\fR] [\fB\-c \fIconfig_dir\fR]
@@ -27,7 +27,7 @@ Postfix configuration utility
 .ti -4
 \fBManaging master.cf service entries:\fR
 
-\fBpostconf\fR \fB\-M\fR [\fB\-fovx\fR] [\fB\-c \fIconfig_dir\fR]
+\fBpostconf\fR \fB\-M\fR [\fB\-foqvx\fR] [\fB\-c \fIconfig_dir\fR]
 [\fIservice\fR[\fB/\fItype\fR]\fI ...\fR]
 
 \fBpostconf\fR \fB\-M\fR [\fB\-ev\fR] [\fB\-c \fIconfig_dir\fR]
@@ -42,7 +42,7 @@ Postfix configuration utility
 .ti -4
 \fBManaging master.cf service fields:\fR
 
-\fBpostconf\fR \fB\-F\fR [\fB\-fhHovx\fR] [\fB\-c \fIconfig_dir\fR]
+\fBpostconf\fR \fB\-F\fR [\fB\-fhHoqvx\fR] [\fB\-c \fIconfig_dir\fR]
 [\fIservice\fR[\fB/\fItype\fR[\fB/\fIfield\fR]]\fI ...\fR]
 
 \fBpostconf\fR \fB\-F\fR [\fB\-ev\fR] [\fB\-c \fIconfig_dir\fR]
@@ -51,7 +51,7 @@ Postfix configuration utility
 .ti -4
 \fBManaging master.cf service parameters:\fR
 
-\fBpostconf\fR \fB\-P\fR [\fB\-fhHovx\fR] [\fB\-c \fIconfig_dir\fR]
+\fBpostconf\fR \fB\-P\fR [\fB\-fhHoqvx\fR] [\fB\-c \fIconfig_dir\fR]
 [\fIservice\fR[\fB/\fItype\fR[\fB/\fIparameter\fR]]\fI ...\fR]
 
 \fBpostconf\fR \fB\-P\fR [\fB\-ev\fR] [\fB\-c \fIconfig_dir\fR]
@@ -299,6 +299,11 @@ Memcache database client. This is described in
 \fBmemcache_table\fR(5).
 
 This feature is available with Postfix 2.9 and later.
+.IP "\fBmongodb\fR"
+MongoDB database client. This is described in
+\fBmongodb_table\fR(5).
+
+This feature is available with Postfix 3.9 and later.
 .IP "\fBmysql\fR (read\-only)"
 MySQL database client.  Available on systems with support
 for MySQL databases.  This is described in \fBmysql_table\fR(5).
@@ -458,6 +463,10 @@ service type fields that are omitted will be handled as "*"
 wildcard fields.
 
 This feature is available with Postfix 2.11 and later.
+.IP \fB\-q\fR
+Do not log warnings for deprecated or unused parameters.
+
+This feature is available with Postfix 3.9 and later.
 .IP "\fB\-t\fR [\fItemplate_file\fR]"
 Display the templates for text that appears at the beginning
 of delivery status notification (DSN) messages, without
diff --git a/man/man1/postdrop.1 b/man/man1/postdrop.1
index 23d6012..9dffd68 100644
--- a/man/man1/postdrop.1
+++ b/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/man/man1/postfix.1 b/man/man1/postfix.1
index c3ad0d8..da39dc5 100644
--- a/man/man1/postfix.1
+++ b/man/man1/postfix.1
@@ -317,7 +317,7 @@ postfix\-wrapper(5), Postfix multi\-instance API
 
 Table\-driven mechanisms:
 access(5), Postfix SMTP access control table
-aliases(5), Postfix alias database
+aliases(5), Postfix local aliasing
 canonical(5), Postfix input address rewriting
 generic(5), Postfix output address rewriting
 header_checks(5), body_checks(5), Postfix content inspection
@@ -330,6 +330,7 @@ cidr_table(5), Associate CIDR pattern with value
 ldap_table(5), Postfix LDAP client
 lmdb_table(5), Postfix LMDB database driver
 memcache_table(5), Postfix memcache client
+mongodb_table(5), Postfix MongoDB client
 mysql_table(5), Postfix MYSQL client
 nisplus_table(5), Postfix NIS+ client
 pcre_table(5), Associate PCRE pattern with value
diff --git a/man/man1/postkick.1 b/man/man1/postkick.1
index 6cd0ef6..779a353 100644
--- a/man/man1/postkick.1
+++ b/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/man/man1/postlock.1 b/man/man1/postlock.1
index cd468e7..6c07319 100644
--- a/man/man1/postlock.1
+++ b/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/man/man1/postlog.1 b/man/man1/postlog.1
index 52bd815..d9723e7 100644
--- a/man/man1/postlog.1
+++ b/man/man1/postlog.1
@@ -94,6 +94,12 @@ The name of an optional logfile that is written by the Postfix
 \fBpostlogd\fR(8) service.
 .IP "\fBpostlog_service_name (postlog)\fR"
 The name of the \fBpostlogd\fR(8) service entry in master.cf.
+.PP
+Available in Postfix 3.9 and later:
+.IP "\fBmaillog_file_permissions (0600)\fR"
+The file access permissions that will be set when the file
+$maillog_file is created for the first time, or when the file is
+created after an existing file is rotated.
 .SH "SEE ALSO"
 .na
 .nf
diff --git a/man/man1/postsuper.1 b/man/man1/postsuper.1
index 885330f..8c5da03 100644
--- a/man/man1/postsuper.1
+++ b/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/man/man1/posttls-finger.1 b/man/man1/posttls-finger.1
index 1e22a03..3cba972 100644
--- a/man/man1/posttls-finger.1
+++ b/man/man1/posttls-finger.1
@@ -109,7 +109,7 @@ fingerprints (with DANE TLSA records the algorithm is specified
 in the DNS).  In Postfix versions prior to 3.6, the default value
 was "md5".
 .IP "\fB\-f\fR"
-Lookup the associated DANE TLSA RRset even when a hostname is not an
+Look up the associated DANE TLSA RRset even when a hostname is not an
 alias and its address records lie in an unsigned zone.  See
 smtp_tls_force_insecure_host_tlsa_lookup for details.
 .IP "\fB\-F \fICAfile.pem\fR (default: none)"
@@ -270,6 +270,15 @@ is typically provided on port 465 by servers that are compatible with
 the SMTP\-in\-SSL protocol, rather than the STARTTLS protocol.
 The destination \fIdomain\fR:\fIport\fR must of course provide such
 a service.
+.IP "\fB\-x\fR"
+Prefer RFC7250 non\-X.509 raw public key (RPK) server credentials.  By
+default only X.509 certificates are accepted.  This is analogous to
+setting \fBsmtp_tls_enable_rpk = yes\fR in the smtp(8) client.  At the
+fingerprint security level, when raw public keys are enabled, only
+public key (and not certificate) fingerprints will be compared against
+the specified list of \fImatch\fR arguments.  Certificate fingerprints
+are fragile when raw public keys are solicited, the server may at some
+point in time start returning only the public key.
 .IP "\fB\-X\fR"
 Enable \fBtlsproxy\fR(8) mode. This is an unsupported mode,
 for program development only.
diff --git a/man/man1/sendmail.1 b/man/man1/sendmail.1
index 22affe6..e3bc7a6 100644
--- a/man/man1/sendmail.1
+++ b/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/man/man1/smtp-source.1 b/man/man1/smtp-source.1
index 014ee10..238bc28 100644
--- a/man/man1/smtp-source.1
+++ b/man/man1/smtp-source.1
@@ -48,7 +48,7 @@ when the listen queue is full.
 Don't disconnect after sending a message; send the next
 message over the same connection.
 .IP "\fB\-f \fIfrom\fR"
-Use the specified sender address (default: <foo@myhostname>).
+Use the specified sender address (default: <foo@my\-hostname>).
 .IP "\fB\-F \fIfile\fR"
 Send the pre\-formatted message header and body in the
 specified \fIfile\fR, while prepending '.' before lines that
@@ -60,31 +60,49 @@ include message headers.
 Speak LMTP rather than SMTP.
 .IP "\fB\-m \fImessage_count\fR"
 Send the specified number of messages (default: 1).
-.IP "\fB\-M \fImyhostname\fR"
+.IP "\fB\-M \fImy\-hostname\fR"
 Use the specified hostname or [address] in the HELO command
 and in the default sender and recipient addresses, instead
 of the machine hostname.
 .IP "\fB\-N\fR"
-Prepend a non\-repeating sequence number to each recipient
-address. This avoids the artificial 100% hit rate in the
-resolve and rewrite client caches and exercises the
-trivial\-rewrite daemon, better approximating Postfix
-performance under real\-life work\-loads.
+Generate each recipient address by appending a number (a
+per\-process recipient counter) to the recipient address
+localpart specified with the \fB\-t\fR option.
+
+Note: to use the number as an address extension, specify
+an explicit address delimiter at the end of the recipient
+localpart, as in "\fB\-t localpart+@domain\fR" or "\fB\-t
+localpart+\fR", where "\fB+\fR" is a Postfix recipient
+address delimiter.
+
+Benefits:
+.RS
+.IP \(bu
+A non\-constant recipient address avoids an unrealistic 100%
+cache hit rate in clients of the Postfix trivial\-rewrite
+service, better approximating performance under real\-life
+work\-loads.
+.IP \(bu
+A fixed recipient address local\-part with a non\-constant
+address extension avoids the need to configure a large
+number of valid recipient addresses in the receiving Postfix
+server.
+.RE
 .IP \fB\-o\fR
 Old mode: don't send HELO, and don't send message headers.
 .IP "\fB\-r \fIrecipient_count\fR"
-Send the specified number of recipients per transaction (default: 1).
-Recipient names are generated by prepending a number to the
-recipient address.
+Send the specified number of recipients per transaction
+(default: 1), and generate recipient addresses as described
+under the \fB\-N\fR option.
 .IP "\fB\-R \fIinterval\fR"
-Wait for a random period of time 0 <= n <= interval between messages.
+Wait a random time (0 <= n <= \fIinterval\fR) between messages.
 Suspending one thread does not affect other delivery threads.
 .IP "\fB\-s \fIsession_count\fR"
 Run the specified number of SMTP sessions in parallel (default: 1).
 .IP "\fB\-S \fIsubject\fR"
 Send mail with the named subject line (default: none).
 .IP "\fB\-t \fIto\fR"
-Use the specified recipient address (default: <foo@myhostname>).
+Use the specified recipient address (default: <foo@my\-hostname>).
 .IP "\fB\-T \fIwindowsize\fR"
 Override the default TCP window size. To work around
 broken TCP window scaling implementations, specify a