From ed72c23b26893cb86dc8d1ef711fd89ef0a042a5 Mon Sep 17 00:00:00 2001
From: Wietse Z Venema
Do nothing. When TLS security enforcement is required, a -persistent enforcement failure will delay the delivery of a TLSRPT -summary until the problem is addressed, or until the message expires +
Do nothing. When TLS security enforcement is required but +fails, a TLSRPT summary message will be delayed +until the problem is addressed, or until the message expires in the mail queue. Keep in mind that TLSRPT is not a real-time monitoring service; it takes on average 12 hours before a failure is reported through TLSRPT.
-Exclude the sender of TLSRPT summaries from TLS enforcement. +
Exclude the sender of TLSRPT summaries from TLS security +enforcement. Implement the configuration below on outbound MTA instances (replace noreply-smtp-tls-reporting@example.com with your actual report generator's sender address):
@@ -296,7 +297,7 @@ generator's sender address):   /etc/postfix/master.cf: # service name type private unpriv chroot wakeup maxproc command - allow-plaintext unix - - n - - smtp + allow-plaintext unix - - - - - smtp -o { smtp_tls_security_level = may } -o { smtp_tls_policy_maps = static:may } diff --git a/postfix/html/postconf.5.html b/postfix/html/postconf.5.html index edfe80420..a40f79520 100644 --- a/postfix/html/postconf.5.html +++ b/postfix/html/postconf.5.html @@ -15871,7 +15871,7 @@ command. the use of disk, CPU and memory resources. The downside is that rejected recipients are logged with NOQUEUE instead of a mail transaction -ID. This complicates the logfile analysis of multi-recipient mail. +ID (also known as a queue ID).This feature is available in Postfix 2.3 and later.
diff --git a/postfix/man/man5/postconf.5 b/postfix/man/man5/postconf.5 index 92dc86518..e10a94bdc 100644 --- a/postfix/man/man5/postconf.5 +++ b/postfix/man/man5/postconf.5 @@ -10670,7 +10670,7 @@ With sites that reject lots of mail, the default setting reduces the use of disk, CPU and memory resources. The downside is that rejected recipients are logged with NOQUEUE instead of a mail transaction -ID. This complicates the logfile analysis of multi\-recipient mail. +ID (also known as a queue ID). .PP This feature is available in Postfix 2.3 and later. .SH smtpd_delay_reject (default: yes) diff --git a/postfix/proto/TLSRPT_README.html b/postfix/proto/TLSRPT_README.html index 503fd9dd3..ce1f16a16 100644 --- a/postfix/proto/TLSRPT_README.html +++ b/postfix/proto/TLSRPT_README.html @@ -276,14 +276,15 @@ when submitting an email message.Do nothing. When TLS security enforcement is required, a -persistent enforcement failure will delay the delivery of a TLSRPT -summary until the problem is addressed, or until the message expires +
Do nothing. When TLS security enforcement is required but +fails, a TLSRPT summary message will be delayed +until the problem is addressed, or until the message expires in the mail queue. Keep in mind that TLSRPT is not a real-time monitoring service; it takes on average 12 hours before a failure is reported through TLSRPT.
-Exclude the sender of TLSRPT summaries from TLS enforcement. +
Exclude the sender of TLSRPT summaries from TLS security +enforcement. Implement the configuration below on outbound MTA instances (replace noreply-smtp-tls-reporting@example.com with your actual report generator's sender address):
@@ -296,7 +297,7 @@ generator's sender address):   /etc/postfix/master.cf: # service name type private unpriv chroot wakeup maxproc command - allow-plaintext unix - - n - - smtp + allow-plaintext unix - - - - - smtp -o { smtp_tls_security_level = may } -o { smtp_tls_policy_maps = static:may } diff --git a/postfix/proto/postconf.proto b/postfix/proto/postconf.proto index dcbc8b2cc..9ce5b6eab 100644 --- a/postfix/proto/postconf.proto +++ b/postfix/proto/postconf.proto @@ -11476,7 +11476,7 @@ command. the use of disk, CPU and memory resources. The downside is that rejected recipients are logged with NOQUEUE instead of a mail transaction -ID. This complicates the logfile analysis of multi-recipient mail. +ID (also known as a queue ID).This feature is available in Postfix 2.3 and later.
diff --git a/postfix/src/cleanup/cleanup_api.c b/postfix/src/cleanup/cleanup_api.c index 9c8e70f7a..85ad1ae88 100644 --- a/postfix/src/cleanup/cleanup_api.c +++ b/postfix/src/cleanup/cleanup_api.c @@ -354,6 +354,7 @@ 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); } /* diff --git a/postfix/src/global/dict_pgsql.c b/postfix/src/global/dict_pgsql.c index 53fafd228..aefd0f6f3 100644 --- a/postfix/src/global/dict_pgsql.c +++ b/postfix/src/global/dict_pgsql.c @@ -733,10 +733,10 @@ DICT *dict_pgsql_open(const char *name, int open_flags, int dict_flags) if (dict_pgsql->pldb->non_uri_target && dict_pgsql->dbname[0] == 0) { DICT *ret; - ret == (dict_surrogate(DICT_TYPE_PGSQL, name, open_flags, dict_flags, + ret = dict_surrogate(DICT_TYPE_PGSQL, name, open_flags, dict_flags, "%s:%s host target '%s' requires dbname setting", - DICT_TYPE_PGSQL, name, - dict_pgsql->pldb->non_uri_target)); + DICT_TYPE_PGSQL, name, + dict_pgsql->pldb->non_uri_target); dict_pgsql_close(&dict_pgsql->dict); return (ret); } diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h index be2eede2a..9de1b2edb 100644 --- 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 "20241027" +#define MAIL_RELEASE_DATE "20241111" #define MAIL_VERSION_NUMBER "3.10" #ifdef SNAPSHOT diff --git a/postfix/src/xsasl/xsasl_dovecot_server.c b/postfix/src/xsasl/xsasl_dovecot_server.c index ac93a2da9..110d2a643 100644 --- a/postfix/src/xsasl/xsasl_dovecot_server.c +++ b/postfix/src/xsasl/xsasl_dovecot_server.c @@ -660,7 +660,9 @@ int xsasl_dovecot_server_first(XSASL_SERVER *xp, const char *sasl_method, for (cpp = server->mechanism_argv->argv; /* see below */ ; cpp++) { if (*cpp == 0) { - vstring_strcpy(reply, "Invalid authentication mechanism"); + vstring_sprintf(reply, "Invalid authentication mechanism: '%s'", + sasl_method); + printable(vstring_str(reply), '?'); return XSASL_AUTH_FAIL; } if (strcasecmp(sasl_method, *cpp) == 0)