postfix-3.4-20180603

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 6796c18826a49b9e29b68e41595e014a4745e285..c8412f1dde3c9f7e51fb8b807b2aedef5792a17c 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -23439,3 +23439,9 @@ Apologies for any names omitted.
        Bugfix (introduced: 20180425): broken implementation of
        voluntary dnsblog retirement after max_use*max_idle seconds.
        File: master/single_server.c.
+
+20180531
+
+       Documentation: bash syntax to eliminate or view default
+       settings in "postconf -n" output. File: postconf/postconf.c.
+       Contributed by various postfix-users list members.

diff --git a/postfix/html/postconf.1.html b/postfix/html/postconf.1.html
index e07de0892a3aba412b5499401e209c0ed28cfb6a..b81ec8826fea0280e8d423554934c19b522dc1ca 100644 (file)
--- a/postfix/html/postconf.1.html
+++ b/postfix/html/postconf.1.html
@@ -401,7 +401,11 @@ POSTCONF(1)                                                        POSTCONF(1)
 
        <b>-n</b>     Show only configuration parameters that have explicit <i>name=value</i>
               settings in <a href="postconf.5.html"><b>main.cf</b></a>.  Specify <b>-nf</b> to fold long lines  for  human
-              readability (Postfix 2.9 and later).
+              readability  (Postfix 2.9 and later). To show settings that dif-
+              fer from built-in defaults only, use the following bash syntax:
+                  comm -23 &lt;(postconf -n) &lt;(postconf -d)
+              Replace  "-23"  with  "-12"  to  show  settings  that  duplicate
+              built-in defaults.
 
        <b>-o</b> <i>name=value</i>
               Override <a href="postconf.5.html"><b>main.cf</b></a> parameter settings.

diff --git a/postfix/man/man1/postconf.1 b/postfix/man/man1/postconf.1
index 600facc2bbd7c434aa63c7df187a9253c92923d3..4976f50104074f8b5ac12b01edb0f0bc99d41a12 100644 (file)
--- a/postfix/man/man1/postconf.1
+++ b/postfix/man/man1/postconf.1
@@ -421,7 +421,13 @@ and "*" wildcard support was added with Postfix 2.11.
 Show only configuration parameters that have explicit
 \fIname=value\fR settings in \fBmain.cf\fR.  Specify \fB\-nf\fR
 to fold long lines for human readability (Postfix 2.9 and
-later).
+later). To show settings that differ from built\-in defaults
+only, use the following bash syntax:
+.nf
+    comm \-23 <(postconf \-n) <(postconf \-d)
+.fi
+Replace "\-23" with "\-12" to show settings that duplicate
+built\-in defaults.
 .IP "\fB\-o \fIname=value\fR"
 Override \fBmain.cf\fR parameter settings.
 

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index c639a831c496c340a0032a86b0bdc7fd4742bced..ae82be407d07a39ef5c91b6eaf5d824c496398f9 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      "20180520"
+#define MAIL_RELEASE_DATE      "20180603"
 #define MAIL_VERSION_NUMBER    "3.4"
 
 #ifdef SNAPSHOT

diff --git a/postfix/src/postconf/postconf.c b/postfix/src/postconf/postconf.c
index 9544c0a3a2ac58de3c0acc56e4afbbae05843b0d..dd8614ab29ff822523e2bf41d5ad925b8ea9ce76 100644 (file)
--- a/postfix/src/postconf/postconf.c
+++ b/postfix/src/postconf/postconf.c
@@ -415,7 +415,13 @@
 /*     Show only configuration parameters that have explicit
 /*     \fIname=value\fR settings in \fBmain.cf\fR.  Specify \fB-nf\fR
 /*     to fold long lines for human readability (Postfix 2.9 and
-/*     later).
+/*     later). To show settings that differ from built-in defaults
+/*     only, use the following bash syntax:
+/* .nf
+/*         comm -23 <(postconf -n) <(postconf -d)
+/* .fi
+/*     Replace "-23" with "-12" to show settings that duplicate
+/*     built-in defaults.
 /* .IP "\fB-o \fIname=value\fR"
 /*     Override \fBmain.cf\fR parameter settings.
 /*