postfix-3.10-20250127

diff --git a/postfix/.indent.pro b/postfix/.indent.pro
index d14b89c2277831be00c40c63d3a1c235f447d3f4..ebb7b727011462cb5f25a09fa8125fc8c17cb723 100644 (file)
--- a/postfix/.indent.pro
+++ b/postfix/.indent.pro
@@ -302,6 +302,7 @@
 -TRESPONSE
 -TREST_TABLE
 -TRES_CONTEXT
+-TRING
 -TRWR_CONTEXT
 -TSCACHE
 -TSCACHE_CLNT

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 6c81e8c9ec88eb9b3ba8921887999b36a2bcbd22..83f568404c5d1701acb423af6c3ef6479d5ebca5 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -28878,3 +28878,13 @@ Apologies for any names omitted.
 
        Cleanup: memory leaks in test code. Files: util/hex_code.c,
        util/argv.c.
+
+20250127
+
+       Cleanup: broken non-TLS builds because of a missing #ifdef
+       USE_TLS/#endif around a new function get_effective_tls_level().
+       File: smtp/smtp_connect.c.
+
+       Cleanup: a few remaining pre-ANSI C function definitions
+       in the lowest-level Postfix code. Files: util/binhash.c,
+       util/close_on_exec.c, util/non_blocking.c.

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 0d155f8e2062c044d2fc213aff7e6c33c1711aab..7dbf579b83b809c181d75b27b25a966f1c6c6f98 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      "20250117"
+#define MAIL_RELEASE_DATE      "20250127"
 #define MAIL_VERSION_NUMBER    "3.10"
 
 #ifdef SNAPSHOT

diff --git a/postfix/src/smtp/smtp_connect.c b/postfix/src/smtp/smtp_connect.c
index 88ea18eb0d51a283f6bc225b6c23e7a4e42dd445..e71e68c4b2ab8d5e2d20569c690251b057f7b302 100644 (file)
--- a/postfix/src/smtp/smtp_connect.c
+++ b/postfix/src/smtp/smtp_connect.c
@@ -498,6 +498,8 @@ static void smtp_cache_policy(SMTP_STATE *state, const char *dest)
     }
 }
 
+#ifdef USE_TLS
+
 /* smtp_get_effective_tls_level - get the effective TLS security level */
 
 static int smtp_get_effective_tls_level(DSN_BUF *why, SMTP_STATE *state)
@@ -543,6 +545,8 @@ static int smtp_get_effective_tls_level(DSN_BUF *why, SMTP_STATE *state)
     return (1);
 }
 
+#endif
+
 /* smtp_connect_local - connect to local server */
 
 static void smtp_connect_local(SMTP_STATE *state, const char *path)

diff --git a/postfix/src/util/binhash.c b/postfix/src/util/binhash.c
index fd9bc877912b61ed4149c530c59d4a985f626d41..0383a899a00ba4ef3c4ee7d8193e56acd1b824d8 100644 (file)
--- a/postfix/src/util/binhash.c
+++ b/postfix/src/util/binhash.c
@@ -346,8 +346,7 @@ void    binhash_walk(BINHASH *table, void (*action) (BINHASH_INFO *, void *),
 
 /* binhash_list - list all table members */
 
-BINHASH_INFO **binhash_list(table)
-BINHASH *table;
+BINHASH_INFO **binhash_list(BINHASH *table)
 {
     BINHASH_INFO **list;
     BINHASH_INFO *member;

diff --git a/postfix/src/util/close_on_exec.c b/postfix/src/util/close_on_exec.c
index efa3415385851af723e2e256fb80170ef7f9fbf4..afa49b873821f4d4c2d5d78608437f121a65ba35 100644 (file)
--- a/postfix/src/util/close_on_exec.c
+++ b/postfix/src/util/close_on_exec.c
@@ -46,9 +46,7 @@
 
 /* close_on_exec - set/clear close-on-exec flag */
 
-int     close_on_exec(fd, on)
-int     fd;
-int     on;
+int     close_on_exec(int fd, int on)
 {
     int     flags;
 

diff --git a/postfix/src/util/non_blocking.c b/postfix/src/util/non_blocking.c
index 6427cd80fc62b01c07d4cc5186a7c2d35ad7db5c..2343814eb3482df6601b4450186f29d1c443fc75 100644 (file)
--- a/postfix/src/util/non_blocking.c
+++ b/postfix/src/util/non_blocking.c
@@ -52,9 +52,7 @@
 
 /* non_blocking - set/clear non-blocking flag */
 
-int     non_blocking(fd, on)
-int     fd;
-int     on;
+int     non_blocking(int fd, int on)
 {
     int     flags;
 

diff --git a/postfix/src/util/ring.c b/postfix/src/util/ring.c
index d4c5f82aef1b010ea2b7655878be61a2f9d2c5ad..9933c4cc0e4c5bf8b7b3539259f3923e1b374a04 100644 (file)
--- a/postfix/src/util/ring.c
+++ b/postfix/src/util/ring.c
@@ -76,17 +76,14 @@
 
 /* ring_init - initialize ring head */
 
-void    ring_init(ring)
-RING   *ring;
+void    ring_init(RING *ring)
 {
     ring->pred = ring->succ = ring;
 }
 
 /* ring_append - insert entry after ring head */
 
-void    ring_append(ring, entry)
-RING   *ring;
-RING   *entry;
+void    ring_append(RING *ring, RING *entry)
 {
     entry->succ = ring->succ;
     entry->pred = ring;
@@ -96,9 +93,7 @@ RING   *entry;
 
 /* ring_prepend - insert new entry before ring head */
 
-void    ring_prepend(ring, entry)
-RING   *ring;
-RING   *entry;
+void    ring_prepend(RING *ring, RING *entry)
 {
     entry->pred = ring->pred;
     entry->succ = ring;
@@ -108,8 +103,7 @@ RING   *entry;
 
 /* ring_detach - remove entry from ring */
 
-void    ring_detach(entry)
-RING   *entry;
+void    ring_detach(RING *entry)
 {
     RING   *succ = entry->succ;
     RING   *pred = entry->pred;