mir/postfix
2
0
Fork 0
mirror of https://github.com/vdukhovni/postfix synced 2025-08-28 12:48:01 +00:00
Code Issues Releases Wiki Activity

postfix-3.6-20210110

Browse Source
This commit is contained in:
Wietse Venema 2021-01-10 00:00:00 -05:00 committed by Viktor Dukhovni
parent 8212a7a0fa
commit fc3ae6c339
9 changed files with 45 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
postfix/HISTORY
View File

@ -25344,3 +25344,12 @@ Apologies for any names omitted.
"major.minor.patch". Files: global/mail_params.[hc], "major.minor.patch". Files: global/mail_params.[hc],
master/master_ent.c, postconf/postconf.c, postfix/postfix.c, master/master_ent.c, postconf/postconf.c, postfix/postfix.c,
proto/COMPATIBILITY_README.html, proto/postconf.proto. 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.

4
postfix/html/postconf.5.html
View File

@ -1657,8 +1657,8 @@ and commands). </p>
</ul> </ul>
<p> With Postfix command that run with set-gid privileges, a <p> With Postfix commands that run with set-gid privileges, a
<a href="postconf.5.html#config_directory">config_directory</a> override requires either root privileges, or it <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> 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> parameter in the default <a href="postconf.5.html">main.cf</a> file. </p>

16
postfix/html/postfix.1.html
View File

@ -217,6 +217,11 @@ POSTFIX(1) POSTFIX(1)
Available in Postfix version 3.0 and later: 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> <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- The location of non-executable files that are shared among mul-
tiple Postfix instances, such as postfix-files, dynamicmaps.cf, tiple Postfix instances, such as postfix-files, dynamicmaps.cf,
@ -294,18 +299,19 @@ POSTFIX(1) POSTFIX(1)
<b>FILES</b> <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> 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 <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>
be shared among multiple instances that run the same Postfix version. <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. <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="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#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>/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>/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> <b>SEE ALSO</b>
Commands: Commands:

12
postfix/man/man1/postfix.1
View File

@ -199,6 +199,9 @@ The directory with Postfix\-writable data files (for example:
caches, pseudo\-random numbers). caches, pseudo\-random numbers).
.PP .PP
Available in Postfix version 3.0 and later: 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" .IP "\fBmeta_directory (see 'postconf -d' output)\fR"
The location of non\-executable files that are shared among The location of non\-executable files that are shared among
multiple Postfix instances, such as postfix\-files, dynamicmaps.cf, 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 .fi
Prior to Postfix version 2.6, all of the following files Prior to Postfix version 2.6, all of the following files
were in \fB$config_directory\fR. Some files are now in were in \fB$config_directory\fR. Some files are now in
\fB$daemon_directory\fR so that they can be shared among \fB$daemon_directory\fR or \fB$meta_directory\fR so that they
multiple instances that run the same Postfix version. can be shared among multiple instances that run the same Postfix
version.
Use the command "\fBpostconf config_directory\fR" or Use the command "\fBpostconf config_directory\fR" or
"\fBpostconf daemon_directory\fR" to expand the names "\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/main.cf, Postfix configuration parameters
$config_directory/master.cf, Postfix daemon processes $config_directory/master.cf, Postfix daemon processes
$daemon_directory/postfix\-files, file/directory permissions
$daemon_directory/postfix\-script, administrative commands $daemon_directory/postfix\-script, administrative commands
$daemon_directory/post\-install, post\-installation configuration $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" .SH "SEE ALSO"
.na .na
.nf .nf

4
postfix/man/man5/postconf.5
View File

@ -1005,8 +1005,8 @@ and commands).
The "\-c" command\-line option (commands only). The "\-c" command\-line option (commands only).
.br .br
.PP .PP
With Postfix command that run with set\-gid privileges, a With Postfix commands that run with set\-gid privileges, a
config_directory override requires either root privileges, or it config_directory override either requires root privileges, or it
requires that the directory is listed with the alternate_config_directories requires that the directory is listed with the alternate_config_directories
parameter in the default main.cf file. parameter in the default main.cf file.
.SH confirm_delay_cleared (default: no) .SH confirm_delay_cleared (default: no)

4
postfix/proto/postconf.proto
View File

@ -9117,8 +9117,8 @@ and commands). </p>
</ul> </ul>
<p> With Postfix command that run with set-gid privileges, a <p> With Postfix commands that run with set-gid privileges, a
config_directory override requires either root privileges, or it config_directory override either requires root privileges, or it
requires that the directory is listed with the alternate_config_directories requires that the directory is listed with the alternate_config_directories
parameter in the default main.cf file. </p> parameter in the default main.cf file. </p>

3
postfix/src/global/mail_params.c
View File

@ -874,7 +874,8 @@ void mail_params_init()
* Extract compatibility level first, so that we can determine what * Extract compatibility level first, so that we can determine what
* parameters of interest are left at their legacy defaults. * 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); get_mail_conf_str_table(compat_level_defaults);
compat_level = compat_level_from_string(var_compatibility_level, msg_fatal); compat_level = compat_level_from_string(var_compatibility_level, msg_fatal);
check_legacy_defaults(); check_legacy_defaults();

2
postfix/src/global/mail_version.h
View File

@ -20,7 +20,7 @@
* Patches change both the patchlevel and the release date. Snapshots have no * Patches change both the patchlevel and the release date. Snapshots have no
* patchlevel; they change the release date only. * patchlevel; they change the release date only.
*/ */
#define MAIL_RELEASE_DATE "20210109" #define MAIL_RELEASE_DATE "20210110"
#define MAIL_VERSION_NUMBER "3.6" #define MAIL_VERSION_NUMBER "3.6"
#ifdef SNAPSHOT #ifdef SNAPSHOT

12
postfix/src/postfix/postfix.c
View File

@ -189,6 +189,9 @@
/* caches, pseudo-random numbers). /* caches, pseudo-random numbers).
/* .PP /* .PP
/* Available in Postfix version 3.0 and later: /* 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" /* .IP "\fBmeta_directory (see 'postconf -d' output)\fR"
/* The location of non-executable files that are shared among /* The location of non-executable files that are shared among
/* multiple Postfix instances, such as postfix-files, dynamicmaps.cf, /* multiple Postfix instances, such as postfix-files, dynamicmaps.cf,
@ -252,8 +255,9 @@
/* .fi /* .fi
/* Prior to Postfix version 2.6, all of the following files /* Prior to Postfix version 2.6, all of the following files
/* were in \fB$config_directory\fR. Some files are now in /* were in \fB$config_directory\fR. Some files are now in
/* \fB$daemon_directory\fR so that they can be shared among /* \fB$daemon_directory\fR or \fB$meta_directory\fR so that they
/* multiple instances that run the same Postfix version. /* can be shared among multiple instances that run the same Postfix
/* version.
/* /*
/* Use the command "\fBpostconf config_directory\fR" or /* Use the command "\fBpostconf config_directory\fR" or
/* "\fBpostconf daemon_directory\fR" to expand the names /* "\fBpostconf daemon_directory\fR" to expand the names
@ -263,10 +267,10 @@
/* /*
/* $config_directory/main.cf, Postfix configuration parameters /* $config_directory/main.cf, Postfix configuration parameters
/* $config_directory/master.cf, Postfix daemon processes /* $config_directory/master.cf, Postfix daemon processes
/* $daemon_directory/postfix-files, file/directory permissions
/* $daemon_directory/postfix-script, administrative commands /* $daemon_directory/postfix-script, administrative commands
/* $daemon_directory/post-install, post-installation configuration /* $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 /* SEE ALSO
/* Commands: /* Commands:
/* postalias(1), create/update/query alias database /* postalias(1), create/update/query alias database