postfix-3.11-20251026

diff --git a/postfix/HISTORY b/postfix/HISTORY
index a43950a6d7a2f22d363331d94ebef6cd67b32d9f..1013be043ae474fb9909dbc177111ec07e6f079b 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -29661,3 +29661,18 @@ Apologies for any names omitted.
        Cleanup: make STS mx hostname pattern enforcement consistent
        with the smtp_cname_overrides_servername setting. File:
        smtp/smtp_connect.c.
+
+20251001
+
+       Cleanup: missing stdlib.h include. Viktor Dukhovni. File:
+       postconf/postconf_edit.c.
+
+       Cleanup: missing USE_TLS include guard. Viktor Dukhovni.
+       Files: smtp/lmtp_params.c, smtp/lmtp_params.c. in
+
+20251021
+
+       Cleanup: the change at 20250717 could result in warnings
+       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.

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 0fd56f3b6977ad4d183661054f7237a375940e6c..06ad2c87530cbeca1380c6f07516639fd5a569bb 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      "20250928"
+#define MAIL_RELEASE_DATE      "20251026"
 #define MAIL_VERSION_NUMBER    "3.11"
 
 #ifdef SNAPSHOT

diff --git a/postfix/src/postconf/postconf_edit.c b/postfix/src/postconf/postconf_edit.c
index 96d1915e2325b1502bae87c7940ac4e59e7a8f1e..64296581715a4b9752d479e5c0d25303e307c7a2 100644 (file)
--- a/postfix/src/postconf/postconf_edit.c
+++ b/postfix/src/postconf/postconf_edit.c
@@ -66,6 +66,7 @@
 /* System library. */
 
 #include <sys_defs.h>
+#include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 

diff --git a/postfix/src/smtp/lmtp_params.c b/postfix/src/smtp/lmtp_params.c
index 963081b5438f411bc27f48a07df4ed30e651d665..b3d456a923f0df03d827850f187cdc852669b011 100644 (file)
--- a/postfix/src/smtp/lmtp_params.c
+++ b/postfix/src/smtp/lmtp_params.c
@@ -140,6 +140,8 @@
        VAR_LMTP_REQ_DEADLINE, DEF_LMTP_REQ_DEADLINE, &var_smtp_req_deadline,
        VAR_LMTP_TLSRPT_ENABLE, DEF_LMTP_TLSRPT_ENABLE, &var_smtp_tlsrpt_enable,
        VAR_LMTP_TLSRPT_SKIP_REUSED_HS, DEF_LMTP_TLSRPT_SKIP_REUSED_HS, &var_smtp_tlsrpt_skip_reused_hs,
+#ifdef USE_TLS
        VAR_LMTP_TLS_ENF_STS_MX_PAT, DEF_LMTP_TLS_ENF_STS_MX_PAT, &var_smtp_tls_enf_sts_mx_pat,
+#endif
        0,
     };

diff --git a/postfix/src/smtp/smtp_params.c b/postfix/src/smtp/smtp_params.c
index 8569cb9f58ae8571d8e9b34cfabc29e5883283a1..64128b72855c2097ca4057f8321ca40472b42a73 100644 (file)
--- a/postfix/src/smtp/smtp_params.c
+++ b/postfix/src/smtp/smtp_params.c
@@ -144,6 +144,8 @@
        VAR_SMTP_REQ_DEADLINE, DEF_SMTP_REQ_DEADLINE, &var_smtp_req_deadline,
        VAR_SMTP_TLSRPT_ENABLE, DEF_SMTP_TLSRPT_ENABLE, &var_smtp_tlsrpt_enable,
        VAR_SMTP_TLSRPT_SKIP_REUSED_HS, DEF_SMTP_TLSRPT_SKIP_REUSED_HS, &var_smtp_tlsrpt_skip_reused_hs,
+#ifdef USE_TLS
        VAR_SMTP_TLS_ENF_STS_MX_PAT, DEF_SMTP_TLS_ENF_STS_MX_PAT, &var_smtp_tls_enf_sts_mx_pat,
+#endif
        0,
     };

diff --git a/postfix/src/util/dict_db.c b/postfix/src/util/dict_db.c
index b1ce8327fa1fe097a8c6c13aad15471e6e1753c2..87177fd55ecd80c061a9574dcfbf733d6cb1d166 100644 (file)
--- a/postfix/src/util/dict_db.c
+++ b/postfix/src/util/dict_db.c
@@ -799,6 +799,7 @@ static DICT *dict_db_open(const char *class, const char *path, int open_flags,
      * the source file changed only seconds ago.
      */
     if ((dict_flags & DICT_FLAG_LOCK) != 0
+       && open_flags == O_RDONLY
        && stat(path, &st) == 0
        && st.st_mtime > dict_db->dict.mtime
        && st.st_mtime < time((time_t *) 0) - 100)

diff --git a/postfix/src/util/dict_dbm.c b/postfix/src/util/dict_dbm.c
index 9c1ceccc8753831cfc4b947c8697faa013ca4011..9a8b8a53e149af7e952f6a73b264ee55c27efa8d 100644 (file)
--- a/postfix/src/util/dict_dbm.c
+++ b/postfix/src/util/dict_dbm.c
@@ -482,6 +482,7 @@ DICT   *dict_dbm_open(const char *path, int open_flags, int dict_flags)
      * the source file changed only seconds ago.
      */
     if ((dict_flags & DICT_FLAG_LOCK) != 0
+       && open_flags == O_RDONLY
        && stat(path, &st) == 0
        && st.st_mtime > dict_dbm->dict.mtime
        && st.st_mtime < time((time_t *) 0) - 100)

diff --git a/postfix/src/util/dict_lmdb.c b/postfix/src/util/dict_lmdb.c
index 9bf3c50eadc7ebbe2ecec02450d2a5df1cc22208..d8111447e5751cbf7e936a2f648ca4ad9db2db49 100644 (file)
--- a/postfix/src/util/dict_lmdb.c
+++ b/postfix/src/util/dict_lmdb.c
@@ -666,6 +666,7 @@ DICT   *dict_lmdb_open(const char *path, int open_flags, int dict_flags)
      * the source file changed only seconds ago.
      */
     if ((dict_flags & DICT_FLAG_LOCK) != 0
+       && open_flags == O_RDONLY
        && stat(path, &st) == 0
        && st.st_mtime > dict_lmdb->dict.mtime
        && st.st_mtime < time((time_t *) 0) - 100)

diff --git a/postfix/src/util/dict_sdbm.c b/postfix/src/util/dict_sdbm.c
index 33ce6aae8a898daedb35488eec29137d9d584e9c..e6803db38893bdaf60f9fdcc4cebbfb29c465d7e 100644 (file)
--- a/postfix/src/util/dict_sdbm.c
+++ b/postfix/src/util/dict_sdbm.c
@@ -459,6 +459,7 @@ DICT   *dict_sdbm_open(const char *path, int open_flags, int dict_flags)
      * the source file changed only seconds ago.
      */
     if ((dict_flags & DICT_FLAG_LOCK) != 0
+       && open_flags == O_RDONLY
        && stat(path, &st) == 0
        && st.st_mtime > dict_sdbm->dict.mtime
        && st.st_mtime < time((time_t *) 0) - 100)