From: Wietse Venema Date: Thu, 22 Feb 2018 05:00:00 +0000 (-0500) Subject: postfix-3.4-20180222 X-Git-Tag: v3.4.0-RC1~43 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=61fe98610d5088eb73efa12c73960d5a67cd0cbc;p=thirdparty%2Fpostfix.git postfix-3.4-20180222 --- diff --git a/postfix/HISTORY b/postfix/HISTORY index 630cb33b7..21af1dbc5 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -23327,7 +23327,7 @@ Apologies for any names omitted. 20180217 - Cleanup: added missing *_maps parameters to the default + Cleanup: added 22 missing *_maps parameters to the default proxy_read_maps setting. Files: global/mail_params.h, mantools/missing-proxy-read-maps. @@ -23338,7 +23338,7 @@ Apologies for any names omitted. of the 20180217 changes in mail_params.h that are no longer needed. - Bugfix: postconf should scan only built-in or service-defined - parameters for ldap, *sql, etc. database names. Files: + Bugfix (introduced: 20120117): postconf should scan only + built-in or service-defined parameters for ldap, *sql, etc. + database names. Problem reported by Christian Rößner. Files: postconf/postconf_user.c. - diff --git a/postfix/html/postfix.1.html b/postfix/html/postfix.1.html index 218ffeb46..cff351cc3 100644 --- a/postfix/html/postfix.1.html +++ b/postfix/html/postfix.1.html @@ -39,7 +39,12 @@ POSTFIX(1) POSTFIX(1) start-fg Like start, but keep the master daemon running in the fore- ground. This requires that multi-instance support is disabled - (i.e. the multi_instance_directories parameter value is empty). + (i.e. the multi_instance_directories parameter value must be + empty). When running Postfix inside a container, mount the con- + tainer host's /dev/log socket inside the container (example: + "docker run -v /dev/log:/dev/log ...") and specify a distinct + Postfix "syslog_name" prefix that identifies logging from the + Postfix instance. stop Stop the Postfix mail system in an orderly fashion. If possible, running processes are allowed to terminate at their earliest diff --git a/postfix/man/man1/postfix.1 b/postfix/man/man1/postfix.1 index 4fdd71301..fa0216050 100644 --- a/postfix/man/man1/postfix.1 +++ b/postfix/man/man1/postfix.1 @@ -41,7 +41,11 @@ check described above. Like \fBstart\fR, but keep the master daemon running in the foreground. This requires that multi\-instance support is disabled (i.e. the multi_instance_directories parameter -value is empty). +value must be empty). When running Postfix inside a container, +mount the container host's /dev/log socket inside the +container (example: "docker run \-v /dev/log:/dev/log ...") +and specify a distinct Postfix "syslog_name" prefix that +identifies logging from the Postfix instance. .IP \fBstop\fR Stop the Postfix mail system in an orderly fashion. If possible, running processes are allowed to terminate at diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h index 47bb8dedd..601f09a17 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 "20180218" +#define MAIL_RELEASE_DATE "20180222" #define MAIL_VERSION_NUMBER "3.4" #ifdef SNAPSHOT diff --git a/postfix/src/postconf/postconf_user.c b/postfix/src/postconf/postconf_user.c index f4a1ccb3a..8d0e726d9 100644 --- a/postfix/src/postconf/postconf_user.c +++ b/postfix/src/postconf/postconf_user.c @@ -35,6 +35,11 @@ /* name spaces for user-defined parameters and flags parameters /* as "valid" in the global name space (pcf_param_table) or /* in the per-service name space (valid_params). +/* +/* This function also invokes pcf_register_dbms_parameters() to +/* to instantiate legacy per-dbms parameters, and to examine +/* per-dbms configuration files. This is limited to the content +/* of global and local, built-in and per-service, parameters. /* DIAGNOSTICS /* Problems are reported to the standard error stream. /* LICENSE @@ -46,6 +51,11 @@ /* IBM T.J. Watson Research /* P.O. Box 704 /* Yorktown Heights, NY 10598, USA +/* +/* Wietse Venema +/* Google, Inc. +/* 111 8th Avenue +/* New York, NY 10011, USA /*--*/ /* System library. */ @@ -292,9 +302,9 @@ static void pcf_scan_user_parameter_namespace(const char *dict_name, #ifdef LEGACY_DBMS_SUPPORT /* - * Scan only parameters that are built-in or service-defined (when - * node == 0, the parameter doesn't exist in the global namespace and - * therefore can't be built-in or service-defined). + * Scan global or local parameters that are built-in or per-service + * (when node == 0, the parameter doesn't exist in the global + * namespace and therefore it can't be built-in or per-service). */ if (node != 0 && (PCF_BUILTIN_PARAMETER(node) || PCF_SERVICE_PARAMETER(node))) diff --git a/postfix/src/postfix/postfix.c b/postfix/src/postfix/postfix.c index 474201527..c9b3174e8 100644 --- a/postfix/src/postfix/postfix.c +++ b/postfix/src/postfix/postfix.c @@ -35,7 +35,11 @@ /* Like \fBstart\fR, but keep the master daemon running in the /* foreground. This requires that multi-instance support is /* disabled (i.e. the multi_instance_directories parameter -/* value is empty). +/* value must be empty). When running Postfix inside a container, +/* mount the container host's /dev/log socket inside the +/* container (example: "docker run -v /dev/log:/dev/log ...") +/* and specify a distinct Postfix "syslog_name" prefix that +/* identifies logging from the Postfix instance. /* .IP \fBstop\fR /* Stop the Postfix mail system in an orderly fashion. If /* possible, running processes are allowed to terminate at