postfix-3.10-20241113

diff --git a/postfix/HISTORY b/postfix/HISTORY
index b67c988eece78452f8a8a47357e05695c71e8fe4..c0e7bfd61c0a85061429a579654ed379ae4ef24c 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -28474,13 +28474,6 @@ Apologies for any names omitted.
        authentication mechanism" now includes the name of that
        mechanism. File: xsasl/xsasl_dovecot_server.c
 
-20241104
-
-       Logging: when a message transaction is canceled (i.e.
-       started but not completed), the cleanup server now logs
-       "queueid: canceled". This provides a clear signal to logfile
-       collation tools. File: cleanup/cleanup_api.c.
-
 20241028
 
        Documentation: TLSRPT_README, section "Delivering TLSRPT
@@ -28497,3 +28490,20 @@ Apologies for any names omitted.
        dict_pgsql_open() returned NULL when "hosts" specified a
        non-URI target and "dbname" was not set. Instead, it should
        return a surrogate dictionary. File: global/dict_pgsql.c.
+
+20241112
+
+       Logging: the cleanup server now logs "queueid: removed
+       (reason)" where "reason" is either "canceled" (message
+       transaction not completed) or "discarded" (DISCARD action
+       in access table, header/body_checks, or Milter response).
+
+20241113
+
+       Bugfix (defect introduced: Postfix 3.10, date 20240923):
+       TLSRPT support in tlsproxy dereferenced non-extent client
+       properties in the server role. Problem reported by Florian
+       Piekert. File: tlsproxy/tlsproxy.c
+
+       Cleanup: removed an unused string variable. File:
+       xsasl/xsasl_cyrus_server.c

diff --git a/postfix/WISHLIST b/postfix/WISHLIST
index 6a6cb0d51d98a739d11c5547f0621038e4869d3c..cbac5860d94f51bf2fcf5fe0645b31cdefaa06e5 100644 (file)
--- a/postfix/WISHLIST
+++ b/postfix/WISHLIST
@@ -35,6 +35,9 @@ Wish list:
 
        Add unit tests for smtp_tlsrpt.c, tlstrpd_wrapper.c, ...
 
+       Add sample master.cf entries for dovecot-lmtp and dovecot-pipe
+       with flags=DORX as appropriate, and single-recipient hints.
+
        Add unit test for extpar.c
 
        Add tests for Message-ID extraction in the cleanup daemon.

diff --git a/postfix/proto/stop.double-history b/postfix/proto/stop.double-history
index 2a02341d3ae51a7546b058fcf85ad8a2938f8e25..e35b3d4daaba5bf19c15e11ff47a9d3db75ffee6 100644 (file)
--- a/postfix/proto/stop.double-history
+++ b/postfix/proto/stop.double-history
@@ -138,3 +138,4 @@ proto  proto mysql_table proto pgsql_table proto ldap_table
  local command c master master c master master h 
  pipe pipe c postfix postfix c postscreen postscreen_dnsbl c 
  qmgr qmgr_entry c qmqpd qmqpd_peer c smtp smtp h 
+ Piekert File tlsproxy tlsproxy c

diff --git a/postfix/proto/stop.spell-history b/postfix/proto/stop.spell-history
index 383098cfd699484a0440d3b8e74414e50ba9a222..3a57097ec2dfcecbedb2f5b7f90d3e8c72284e39 100644 (file)
--- a/postfix/proto/stop.spell-history
+++ b/postfix/proto/stop.spell-history
@@ -86,3 +86,4 @@ testfiles
 Antonin
 Verrier
 unescaped
+dereferenced

diff --git a/postfix/src/cleanup/cleanup_api.c b/postfix/src/cleanup/cleanup_api.c
index 85ad1ae888a46d4b721276f65c55451250e065a3..83ef0f084f2435cd80747fd44b8044ccbf7a1976 100644 (file)
--- a/postfix/src/cleanup/cleanup_api.c
+++ b/postfix/src/cleanup/cleanup_api.c
@@ -354,7 +354,8 @@ int     cleanup_flush(CLEANUP_STATE *state)
            (void) REMOVE(vstring_str(cleanup_trace_path));
        if (REMOVE(cleanup_path))
            msg_warn("remove %s: %m", cleanup_path);
-       msg_info("%s: canceled", state->queue_id);
+       msg_info("%s: removed (%s)", state->queue_id, state->errs ?
+                "canceled" : "discarded");
     }
 
     /*

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 9de1b2edbb23acfb0cbc74d35bc977073f6d1fb6..95ff70c9dc63a5f348432d759a4ce4f4ebff2665 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      "20241111"
+#define MAIL_RELEASE_DATE      "20241113"
 #define MAIL_VERSION_NUMBER    "3.10"
 
 #ifdef SNAPSHOT

diff --git a/postfix/src/tlsproxy/tlsproxy.c b/postfix/src/tlsproxy/tlsproxy.c
index 34131102727e3f0a753f8e4c0aacbc6d3a0e1d4d..5159d54a802c61ba21eb5b2132ed092decc57402 100644 (file)
--- a/postfix/src/tlsproxy/tlsproxy.c
+++ b/postfix/src/tlsproxy/tlsproxy.c
@@ -738,9 +738,9 @@ static int tlsp_eval_tls_error(TLSP_STATE *state, int err)
         * already reported.
         */
 #ifdef USE_TLSRPT
-       if (state->client_start_props->tlsrpt
+       if (state->is_server_role == 0
            && (state->flags & TLSP_FLAG_DO_HANDSHAKE)
-           && state->is_server_role == 0)
+           && state->client_start_props->tlsrpt)
            trw_report_failure(state->client_start_props->tlsrpt,
                               TLSRPT_VALIDATION_FAILURE,
                                /* additional_info= */ (char *) 0,

diff --git a/postfix/src/xsasl/xsasl_cyrus_server.c b/postfix/src/xsasl/xsasl_cyrus_server.c
index e9032892f17b9011fb44bb0bcb0daffa372890f1..46b8fa3012637b5638e0d71565416ad81014fbdc 100644 (file)
--- a/postfix/src/xsasl/xsasl_cyrus_server.c
+++ b/postfix/src/xsasl/xsasl_cyrus_server.c
@@ -621,7 +621,6 @@ static int xsasl_cyrus_server_next(XSASL_SERVER *xp, const char *request,
 
 static const char *xsasl_cyrus_server_get_username(XSASL_SERVER *xp)
 {
-    const char *myname = "xsasl_cyrus_server_get_username";
     XSASL_CYRUS_SERVER *server = (XSASL_CYRUS_SERVER *) xp;
     VOID_SERVEROUT_TYPE serverout = 0;
     int     sasl_status;