postfix-3.4-20180222

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 630cb33b7cd8690b169851b8eedd9dacd16a54d4..21af1dbc570da6a979be4967428a0a151f3cf3dd 100644 (file)
--- 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 218ffeb463259ace5cd1c61abb07c1e3ba4ff5f1..cff351cc3bbb8393ec9eeb4b02538715961c2f23 100644 (file)
--- a/postfix/html/postfix.1.html
+++ b/postfix/html/postfix.1.html
@@ -39,7 +39,12 @@ POSTFIX(1)                                                          POSTFIX(1)
        <b>start-fg</b>
               Like <b>start</b>, but keep the master  daemon  running  in  the  fore-
               ground.  This  requires  that multi-instance support is disabled
-              (i.e. the <a href="postconf.5.html#multi_instance_directories">multi_instance_directories</a> parameter value is  empty).
+              (i.e. the <a href="postconf.5.html#multi_instance_directories">multi_instance_directories</a>  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 "<a href="postconf.5.html#syslog_name">syslog_name</a>" prefix that identifies  logging  from  the
+              Postfix instance.
 
        <b>stop</b>   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 4fdd713012383a51618a0eb1bbdbea971e22af32..fa0216050aef23323844e64cbbd7d1ea4f00f106 100644 (file)
--- 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 47bb8dedd1adbd111c4e6d0bb35e779403f95133..601f09a17574687dddf2574e073c55e205cf5bf8 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      "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 f4a1ccb3a0b085fc74b6d8e2ba1d5e60d67d201c..8d0e726d9eb0bad846cfc6f0210fd99593de7946 100644 (file)
--- 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 47420152717fc396feb65b440e6dc3e68d93484a..c9b3174e838591cf7eca14a9d8be001f21b31323 100644 (file)
--- 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