diff --git a/postfix/HISTORY b/postfix/HISTORY index 5b06aab4f..b0b7d6c95 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -22010,3 +22010,18 @@ Apologies for any names omitted. Bitrot: OpenSSL API cleanups. Viktor Dukhovni. Files: .indent.pro, tls/tls.h, tls/tls_dane.c, tls/tls_fprint.c, tls/tls_misc.c, tls/tls_server.c, tls/tls_verify.c. + +20151124 + + Bugfix (introduced: Postfix 3.0): don't throttle a destination + after opportunistic TLS failure. Viktor Dukhovni and Wietse. + Files: smtp/smtp_proto.c, smtp/smtp.h, smtp/smtp_trouble.c. + +20151128 + + Feature: JSON-formatted queue listing with "postqueue -j". + Output is a stream of JSON objects, one per queue file. To + simplify stream-mode parsing, each JSON object is followed by + a newline character. Files: postqueue/postqueue.c, + postqueue/postqueue.h, postqueue/showq_compat.c, + postqueue/showq_json.c, showq/showq.c. diff --git a/postfix/README_FILES/STRESS_README b/postfix/README_FILES/STRESS_README index 85b73f521..ea535aaa6 100644 --- a/postfix/README_FILES/STRESS_README +++ b/postfix/README_FILES/STRESS_README @@ -105,8 +105,8 @@ later. 6 smtpd_starttls_timeout = ${stress?{10}:{300}}s 7 address_verify_poll_count = ${stress?{1}:{3}} -With Postfix versions before 3.0, replace ${stress?{x}:{y}} with ${stress?x}$ -{stress:y}. +Postfix versions before 3.0 use the older form ${stress?x}${stress:y} instead +of the newer form ${stress?{x}:{y}}. Translation: @@ -149,8 +149,8 @@ Translation: $unverified_sender_tempfail_action. No mail should be lost, as long as this measure is used only temporarily. -The syntax of ${name?value} and ${name:value} is explained at the beginning of -the postconf(5) manual page. +The syntax of ${name?{value}:{value}}, ${name?value} and ${name:value} is +explained at the beginning of the postconf(5) manual page. NOTE: Please keep in mind that the stress-adaptive feature is a fairly desperate measure to keep ssoommee legitimate mail flowing under overload diff --git a/postfix/html/STRESS_README.html b/postfix/html/STRESS_README.html index 3c0d0f622..4255dbefa 100644 --- a/postfix/html/STRESS_README.html +++ b/postfix/html/STRESS_README.html @@ -168,8 +168,8 @@ default with Postfix 2.6 and later.
-With Postfix versions before 3.0, replace ${stress?{x}:{y}} -with ${stress?x}${stress:y}.
+Postfix versions before 3.0 use the older form ${stress?x}${stress:y} +instead of the newer form ${stress?{x}:{y}}.
Translation:
@@ -219,8 +219,9 @@ as this measure is used only temporarily.
-The syntax of ${name?value} and ${name:value} is explained at -the beginning of the postconf(5) manual page.
+The syntax of ${name?{value}:{value}}, ${name?value} and +${name:value} is explained at the beginning of the postconf(5) +manual page.
NOTE: Please keep in mind that the stress-adaptive feature is a fairly desperate measure to keep some legitimate mail diff --git a/postfix/html/postqueue.1.html b/postfix/html/postqueue.1.html index d22c06945..3a332d720 100644 --- a/postfix/html/postqueue.1.html +++ b/postfix/html/postqueue.1.html @@ -10,11 +10,20 @@ POSTQUEUE(1) POSTQUEUE(1) postqueue - Postfix queue control SYNOPSIS + To flush the mail queue: + postqueue [-v] [-c config_dir] -f + postqueue [-v] [-c config_dir] -i queue_id - postqueue [-v] [-c config_dir] -p + postqueue [-v] [-c config_dir] -s site + To list the mail queue: + + postqueue [-v] [-c config_dir] -j + + postqueue [-v] [-c config_dir] -p + DESCRIPTION The postqueue(1) command implements the Postfix user interface for queue management. It implements operations that are traditionally @@ -46,6 +55,51 @@ POSTQUEUE(1) POSTQUEUE(1) This feature is available with Postfix version 2.4 and later. + -j Produce a queue listing in JSON format, based on output from the + showq(8) daemon. The result is a stream of zero or more JSON + objects, one per queue file. Each object is followed by a new- + line character to support simple streaming parsers. + + Object members have string values unless indicated otherwise. + Programs should ignore object members that are not listed here; + the list of members is expected to grow over time. + + queue_name + The name of the queue where the message was found. Note + that the contents of the mail queue may change while it + is being listed; some messages may appear more than once, + and some messages may be missed. + + queue_id + The queue file name. The name may be reused unless + "enable_long_queue_ids = true". + + arrival_time + The number of seconds since the start of the UNIX epoch. + + message_size + The number of bytes in the message header and body. This + number does not include message envelope information. It + is approximately equal to the number of bytes that would + be transmitted via SMTP including the <CR><LF> line end- + ings. + + sender The envelope sender address. + + recipients + An array containing zero or more objects with members: + + address + One recipient address. + + delay_reason + If present, the reason for delayed delivery. Some + delayed recipients have no delay reason, for exam- + ple, when delivery is in progress or when the sys- + tem was stopped before it could record the reason. + + This feature is available in Postfix 3.1 and later. + -p Produce a traditional sendmail-style queue listing. This option implements the traditional mailq command, by contacting the Postfix showq(8) daemon. @@ -82,6 +136,9 @@ POSTQUEUE(1) POSTQUEUE(1) This program is designed to run with set-group ID privileges, so that it can connect to Postfix daemon processes. +STANDARDS + RFC 7159 (JSON notation) + DIAGNOSTICS Problems are logged to syslogd(8) and to the standard error stream. @@ -169,5 +226,10 @@ POSTQUEUE(1) POSTQUEUE(1) P.O. Box 704 Yorktown Heights, NY 10598, USA + Wietse Venema + Google, Inc. + 111 8th Avenue + New York, NY 10011, USA + POSTQUEUE(1)