From: Wietse Venema <wietse@porcupine.org>
Date: Sun, 3 Jun 2018 05:00:00 +0000 (-0500)
Subject: postfix-3.4-20180603
X-Git-Tag: v3.4.0-RC1~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ce13d8bfdb6710ea05eac1b7ed2056594495238;p=thirdparty%2Fpostfix.git

postfix-3.4-20180603
---

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 6796c1882..c8412f1dd 100644
--- 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 e07de0892..b81ec8826 100644
--- 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 600facc2b..4976f5010 100644
--- 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 c639a831c..ae82be407 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	"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 9544c0a3a..dd8614ab2 100644
--- 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.
 /*