From: Wietse Venema <wietse@porcupine.org>
Date: Mon, 19 Apr 2021 05:00:00 +0000 (-0500)
Subject: postfix-3.6-20210419
X-Git-Tag: v3.6.0-RC1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5d90789f478fb74a8ae7b16d937e58f0743fe47;p=thirdparty%2Fpostfix.git

postfix-3.6-20210419
---

diff --git a/postfix/HISTORY b/postfix/HISTORY
index eade118da..581235eac 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -25525,3 +25525,9 @@ Apologies for any names omitted.
 	smtpd/smtpd.c, util/Makefile.in, util/find_inet.c,
 	util/known_tcp_ports.c, util/known_tcp_ports.h,
 	util/known_tcp_ports.ref, util/myaddrinfo.c.
+
+20210419
+
+	Bugfix (bug introduced 20210102): panic in some postconf
+	commands due to duplicate initialization of compatibility
+	level comparison operators. File: global/compat_level.c.
diff --git a/postfix/src/global/compat_level.c b/postfix/src/global/compat_level.c
index 7cb8d010a..1fb3a6851 100644
--- a/postfix/src/global/compat_level.c
+++ b/postfix/src/global/compat_level.c
@@ -309,8 +309,10 @@ void    compat_level_relop_register(void)
 	MAC_EXP_OP_TOK_LT, MAC_EXP_OP_TOK_LE,
 	0,
     };
+    static int register_done;
 
-    mac_expand_add_relop(compat_level_relops, "level", compat_relop_eval);
+    if (register_done++ == 0)
+	mac_expand_add_relop(compat_level_relops, "level", compat_relop_eval);
 }
 
 #ifdef TEST
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 0deafb068..dbf6fa769 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	"20210418"
+#define MAIL_RELEASE_DATE	"20210419"
 #define MAIL_VERSION_NUMBER	"3.6"
 
 #ifdef SNAPSHOT