postfix-3.6-20210419

diff --git a/postfix/HISTORY b/postfix/HISTORY
index eade118da7222e042865f652a7a5fb57a8a956b3..581235eac16da83ddc2b36ea4d4e3d848ee436ac 100644 (file)
--- 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 7cb8d010a532cf341669ae414990e421245926c6..1fb3a68510d22b14ed0af53f7079094592d91588 100644 (file)
--- 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 0deafb068c79b494771a94c932938831e7a99703..dbf6fa7699a75a79c0eaea80cc87ce7f38ec00e2 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      "20210418"
+#define MAIL_RELEASE_DATE      "20210419"
 #define MAIL_VERSION_NUMBER    "3.6"
 
 #ifdef SNAPSHOT