postfix-3.6-20210110

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 1d5d5d47986ca740d7ac3bbfdd185e0bc62a5c8b..27bc384d03e19fd0320f33200bfa6764cb2071b3 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -25344,3 +25344,12 @@ Apologies for any names omitted.
        "major.minor.patch". Files: global/mail_params.[hc],
        master/master_ent.c, postconf/postconf.c, postfix/postfix.c,
        proto/COMPATIBILITY_README.html, proto/postconf.proto.
+
+20210110
+
+       Documentation: the postfix(1) manpage missed some changes
+       that were introduced in the Postfix 3.0 development
+       cycle. File:postfix/postfix.c.
+
+       Bugfix: the 20210109 change broke 'postfix reload' for the
+       master daemon. File: global/mail_params.c.

diff --git a/postfix/html/postconf.5.html b/postfix/html/postconf.5.html
index 68316e7abbb85e61a82e4725defcd901206c523e..de49f00c39e6e27c346c566dfdbbca4655c56279 100644 (file)
--- a/postfix/html/postconf.5.html
+++ b/postfix/html/postconf.5.html
@@ -1657,8 +1657,8 @@ and commands). </p>
 
 </ul>
 
-<p> With Postfix command that run with set-gid privileges, a
-<a href="postconf.5.html#config_directory">config_directory</a> override requires either root privileges, or it
+<p> With Postfix commands that run with set-gid privileges, a
+<a href="postconf.5.html#config_directory">config_directory</a> override either requires root privileges, or it
 requires that the directory is listed with the <a href="postconf.5.html#alternate_config_directories">alternate_config_directories</a>
 parameter in the default <a href="postconf.5.html">main.cf</a> file.  </p>
 

diff --git a/postfix/html/postfix.1.html b/postfix/html/postfix.1.html
index e9cf42b7e351018210eab9b8ea55b55f46cb8a54..2e5b4eb2ab8851c2bce805dfaabf1a993fa8acea 100644 (file)
--- a/postfix/html/postfix.1.html
+++ b/postfix/html/postfix.1.html
@@ -217,6 +217,11 @@ POSTFIX(1)                                                          POSTFIX(1)
 
        Available in Postfix version 3.0 and later:
 
+       <b><a href="postconf.5.html#compatibility_level">compatibility_level</a> (0)</b>
+              A  safety net that causes Postfix to run with backwards-compati-
+              ble default settings after an upgrade to a  newer  Postfix  ver-
+              sion.
+
        <b><a href="postconf.5.html#meta_directory">meta_directory</a> (see 'postconf -d' output)</b>
               The  location of non-executable files that are shared among mul-
               tiple Postfix instances, such as postfix-files,  dynamicmaps.cf,
@@ -294,18 +299,19 @@ POSTFIX(1)                                                          POSTFIX(1)
 
 <b>FILES</b>
        Prior to Postfix version 2.6, all of the following files were in  <b>$<a href="postconf.5.html#config_directory">con</a>-</b>
-       <b><a href="postconf.5.html#config_directory">fig_directory</a></b>. Some files are now in <b>$<a href="postconf.5.html#daemon_directory">daemon_directory</a></b> so that they can
-       be shared among multiple instances that run the same Postfix version.
+       <b><a href="postconf.5.html#config_directory">fig_directory</a></b>.  Some files are now in <b>$<a href="postconf.5.html#daemon_directory">daemon_directory</a></b> or <b>$meta_direc-</b>
+       <b>tory</b> so that they can be shared among multiple instances that  run  the
+       same Postfix version.
 
-       Use the command "<b>postconf <a href="postconf.5.html#config_directory">config_directory</a></b>" or "<b>postconf  <a href="postconf.5.html#daemon_directory">daemon_direc</a>-</b>
+       Use  the command "<b>postconf <a href="postconf.5.html#config_directory">config_directory</a></b>" or "<b>postconf <a href="postconf.5.html#daemon_directory">daemon_direc</a>-</b>
        <b><a href="postconf.5.html#daemon_directory">tory</a></b>" to expand the names into their actual values.
 
        $<a href="postconf.5.html#config_directory">config_directory</a>/<a href="postconf.5.html">main.cf</a>, Postfix configuration parameters
        $<a href="postconf.5.html#config_directory">config_directory</a>/<a href="master.5.html">master.cf</a>, Postfix daemon processes
-       $<a href="postconf.5.html#daemon_directory">daemon_directory</a>/postfix-files, file/directory permissions
        $<a href="postconf.5.html#daemon_directory">daemon_directory</a>/postfix-script, administrative commands
        $<a href="postconf.5.html#daemon_directory">daemon_directory</a>/post-install, post-installation configuration
-       $<a href="postconf.5.html#daemon_directory">daemon_directory</a>/dynamicmaps.cf, plug-in database clients
+       $<a href="postconf.5.html#meta_directory">meta_directory</a>/dynamicmaps.cf, plug-in database clients
+       $<a href="postconf.5.html#meta_directory">meta_directory</a>/postfix-files, file/directory permissions
 
 <b>SEE ALSO</b>
        Commands:

diff --git a/postfix/man/man1/postfix.1 b/postfix/man/man1/postfix.1
index 412c0c9d1c1bfd2354c6a3b358d29b0531cc1d99..38e518173f70369ada736f78f37d1c07c68ca60e 100644 (file)
--- a/postfix/man/man1/postfix.1
+++ b/postfix/man/man1/postfix.1
@@ -199,6 +199,9 @@ The directory with Postfix\-writable data files (for example:
 caches, pseudo\-random numbers).
 .PP
 Available in Postfix version 3.0 and later:
+.IP "\fBcompatibility_level (0)\fR"
+A safety net that causes Postfix to run with backwards\-compatible
+default settings after an upgrade to a newer Postfix version.
 .IP "\fBmeta_directory (see 'postconf -d' output)\fR"
 The location of non\-executable files that are shared among
 multiple Postfix instances, such as postfix\-files, dynamicmaps.cf,
@@ -264,8 +267,9 @@ The name of the \fBpostlogd\fR(8) service entry in master.cf.
 .fi
 Prior to Postfix version 2.6, all of the following files
 were in \fB$config_directory\fR. Some files are now in
-\fB$daemon_directory\fR so that they can be shared among
-multiple instances that run the same Postfix version.
+\fB$daemon_directory\fR or \fB$meta_directory\fR so that they
+can be shared among multiple instances that run the same Postfix
+version.
 
 Use the command "\fBpostconf config_directory\fR" or
 "\fBpostconf daemon_directory\fR" to expand the names
@@ -275,10 +279,10 @@ into their actual values.
 
 $config_directory/main.cf, Postfix configuration parameters
 $config_directory/master.cf, Postfix daemon processes
-$daemon_directory/postfix\-files, file/directory permissions
 $daemon_directory/postfix\-script, administrative commands
 $daemon_directory/post\-install, post\-installation configuration
-$daemon_directory/dynamicmaps.cf, plug\-in database clients
+$meta_directory/dynamicmaps.cf, plug\-in database clients
+$meta_directory/postfix\-files, file/directory permissions
 .SH "SEE ALSO"
 .na
 .nf

diff --git a/postfix/man/man5/postconf.5 b/postfix/man/man5/postconf.5
index d40fe566a98bbb77a4080c37d2684016af906374..91b87775796f69a8ebfa8447af6aa6d01163098b 100644 (file)
--- a/postfix/man/man5/postconf.5
+++ b/postfix/man/man5/postconf.5
@@ -1005,8 +1005,8 @@ and commands).
 The "\-c" command\-line option (commands only).
 .br
 .PP
-With Postfix command that run with set\-gid privileges, a
-config_directory override requires either root privileges, or it
+With Postfix commands that run with set\-gid privileges, a
+config_directory override either requires root privileges, or it
 requires that the directory is listed with the alternate_config_directories
 parameter in the default main.cf file.
 .SH confirm_delay_cleared (default: no)

diff --git a/postfix/proto/postconf.proto b/postfix/proto/postconf.proto
index cccd0a28367a62ed075c97c621b07fb1d72bfe3a..e95a10baee70df43fed00d3294402d3d29e5dc53 100644 (file)
--- a/postfix/proto/postconf.proto
+++ b/postfix/proto/postconf.proto
@@ -9117,8 +9117,8 @@ and commands). </p>
 
 </ul>
 
-<p> With Postfix command that run with set-gid privileges, a
-config_directory override requires either root privileges, or it
+<p> With Postfix commands that run with set-gid privileges, a
+config_directory override either requires root privileges, or it
 requires that the directory is listed with the alternate_config_directories
 parameter in the default main.cf file.  </p>
 

diff --git a/postfix/src/global/mail_params.c b/postfix/src/global/mail_params.c
index 526879c3eb1797dfd87f98958cbc862298aaa8f1..95c91ccc839121b081355927cf1576b7e71c9011 100644 (file)
--- a/postfix/src/global/mail_params.c
+++ b/postfix/src/global/mail_params.c
@@ -874,7 +874,8 @@ void    mail_params_init()
      * Extract compatibility level first, so that we can determine what
      * parameters of interest are left at their legacy defaults.
      */
-    compat_level_relop_register();
+    if (var_compatibility_level == 0)
+       compat_level_relop_register();
     get_mail_conf_str_table(compat_level_defaults);
     compat_level = compat_level_from_string(var_compatibility_level, msg_fatal);
     check_legacy_defaults();

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index f57e73196d04aa0289cabe312df7d324ccbcb58c..1250d0099a7195ac7de2e194b023d7d399e354a2 100644 (file)
--- 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      "20210109"
+#define MAIL_RELEASE_DATE      "20210110"
 #define MAIL_VERSION_NUMBER    "3.6"
 
 #ifdef SNAPSHOT

diff --git a/postfix/src/postfix/postfix.c b/postfix/src/postfix/postfix.c
index 4a63f4ed29e2310cceb93a40efe86aad4c4e21eb..0c0e6fd7a02f3f2dd570d27bd4c009361533998b 100644 (file)
--- a/postfix/src/postfix/postfix.c
+++ b/postfix/src/postfix/postfix.c
@@ -189,6 +189,9 @@
 /*     caches, pseudo-random numbers).
 /* .PP
 /*     Available in Postfix version 3.0 and later:
+/* .IP "\fBcompatibility_level (0)\fR"
+/*     A safety net that causes Postfix to run with backwards-compatible
+/*     default settings after an upgrade to a newer Postfix version.
 /* .IP "\fBmeta_directory (see 'postconf -d' output)\fR"
 /*     The location of non-executable files that are shared among
 /*     multiple Postfix instances, such as postfix-files, dynamicmaps.cf,
@@ -252,8 +255,9 @@
 /* .fi
 /*     Prior to Postfix version 2.6, all of the following files
 /*     were in \fB$config_directory\fR. Some files are now in
-/*     \fB$daemon_directory\fR so that they can be shared among
-/*     multiple instances that run the same Postfix version.
+/*     \fB$daemon_directory\fR or \fB$meta_directory\fR so that they
+/*     can be shared among multiple instances that run the same Postfix
+/*     version.
 /*
 /*     Use the command "\fBpostconf config_directory\fR" or
 /*     "\fBpostconf daemon_directory\fR" to expand the names
@@ -263,10 +267,10 @@
 /*
 /*     $config_directory/main.cf, Postfix configuration parameters
 /*     $config_directory/master.cf, Postfix daemon processes
-/*     $daemon_directory/postfix-files, file/directory permissions
 /*     $daemon_directory/postfix-script, administrative commands
 /*     $daemon_directory/post-install, post-installation configuration
-/*     $daemon_directory/dynamicmaps.cf, plug-in database clients
+/*     $meta_directory/dynamicmaps.cf, plug-in database clients
+/*     $meta_directory/postfix-files, file/directory permissions
 /* SEE ALSO
 /*     Commands:
 /*     postalias(1), create/update/query alias database