postfix-3.9.7

diff --git a/postfix/HISTORY b/postfix/HISTORY
index ba062204ba05e212ae9511c3971edccd08adcbed..8322a4be7deea31c612efba772834b02f4cddc56 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -28239,3 +28239,15 @@ Apologies for any names omitted.
        with "database X is older than source file Y". Files:
        util/dict.c, util/dict_db.c, util/dict_dbm.c, util/dict_lmdb.c,
        util/dict_sdbm.c.
+
+20251028
+
+       Documentation: removed incorrect text from the parameter
+       description for smtp_cname_overrides_servername. File:
+       proto/postconf.proto.
+
+20251120
+
+       Bugfix (defect introduced: Postfix 2.9, date: 20120307):
+       segfault with duplicate parameter name in "postconf -X" or
+       "postconf -#'. File: postconf/postconf_edit.c.

diff --git a/postfix/html/postconf.5.html b/postfix/html/postconf.5.html
index fbd317a868170e76d220942b8d3c8195a2c78596..d012b8d1749ef396252006f953f22dfede24acde 100644 (file)
--- a/postfix/html/postconf.5.html
+++ b/postfix/html/postconf.5.html
@@ -11229,10 +11229,6 @@ false hostname information in DNS CNAME records, and makes SASL
 password file lookups more predictable. This is the default setting
 as of Postfix 2.3. </p>
 
-<p> When DNS CNAME records are validated with secure DNS lookups
-(<a href="postconf.5.html#smtp_dns_support_level">smtp_dns_support_level</a> = dnssec), they are always allowed to
-override the above servername (Postfix 2.11 and later). </p>
-
 <p> This feature is available in Postfix 2.2.9 and later. </p>
 
 

diff --git a/postfix/man/man5/postconf.5 b/postfix/man/man5/postconf.5
index d6e333c9dd9f2572730d1f5e04c16c0ade8d1bae..d8038c327afe057ffb5c794148d6df60f180304a 100644 (file)
--- a/postfix/man/man5/postconf.5
+++ b/postfix/man/man5/postconf.5
@@ -7202,10 +7202,6 @@ false hostname information in DNS CNAME records, and makes SASL
 password file lookups more predictable. This is the default setting
 as of Postfix 2.3.
 .PP
-When DNS CNAME records are validated with secure DNS lookups
-(smtp_dns_support_level = dnssec), they are always allowed to
-override the above servername (Postfix 2.11 and later).
-.PP
 This feature is available in Postfix 2.2.9 and later.
 .SH smtp_connect_timeout (default: 30s)
 The Postfix SMTP client time limit for completing a TCP connection, or

diff --git a/postfix/proto/postconf.proto b/postfix/proto/postconf.proto
index 023b1eef277d1d7d530aeff7a8ab441a90ade56f..abd3924cbc162a318bb5adee37b2f0bb8ed28c95 100644 (file)
--- a/postfix/proto/postconf.proto
+++ b/postfix/proto/postconf.proto
@@ -11312,10 +11312,6 @@ false hostname information in DNS CNAME records, and makes SASL
 password file lookups more predictable. This is the default setting
 as of Postfix 2.3. </p>
 
-<p> When DNS CNAME records are validated with secure DNS lookups
-(smtp_dns_support_level = dnssec), they are always allowed to
-override the above servername (Postfix 2.11 and later). </p>
-
 <p> This feature is available in Postfix 2.2.9 and later. </p>
 
 %PARAM lmtp_cname_overrides_servername yes

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index efe069408cd170f80034df1cacdbb88255abefb7..9a46e63224d8577760e94ebc39218fb636c33303 100644 (file)
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,8 +20,8 @@
   * Patches change both the patchlevel and the release date. Snapshots have no
   * patchlevel; they change the release date only.
   */
-#define MAIL_RELEASE_DATE      "20251026"
-#define MAIL_VERSION_NUMBER    "3.9.6"
+#define MAIL_RELEASE_DATE      "20251125"
+#define MAIL_VERSION_NUMBER    "3.9.7"
 
 #ifdef SNAPSHOT
 #define MAIL_VERSION_DATE      "-" MAIL_RELEASE_DATE

diff --git a/postfix/src/postconf/postconf_edit.c b/postfix/src/postconf/postconf_edit.c
index 64296581715a4b9752d479e5c0d25303e307c7a2..2808290bf444685a416947d19d16cc14a88076f7 100644 (file)
--- a/postfix/src/postconf/postconf_edit.c
+++ b/postfix/src/postconf/postconf_edit.c
@@ -209,8 +209,10 @@ void    pcf_edit_main(int mode, int argc, char **argv)
            msg_panic("pcf_edit_main: unknown mode %d", mode);
        }
        if ((cvalue = htable_find(table, pattern)) != 0) {
-           msg_warn("ignoring earlier request: '%s = %s'",
-                    pattern, cvalue->value);
+           if (edit_value && cvalue->value 
+               && strcmp(edit_value, cvalue->value) != 0)
+               msg_warn("ignoring earlier request: '%s = %s'",
+                        pattern, cvalue->value);
            htable_delete(table, pattern, myfree);
        }
        cvalue = (struct cvalue *) mymalloc(sizeof(*cvalue));