From 8b3a0bab4b6bf63a5cd6571f82af5512b578ddfa Mon Sep 17 00:00:00 2001
From: Wietse Venema <wietse@porcupine.org>
Date: Mon, 27 Aug 2018 00:00:00 -0500
Subject: [PATCH] postfix-3.4-20180827

---
 postfix/HISTORY                          |  5 +++++
 postfix/README_FILES/SMTPD_POLICY_README | 12 ++++++++----
 postfix/html/SMTPD_POLICY_README.html    | 11 +++++++----
 postfix/html/postconf.5.html             |  8 ++++++--
 postfix/man/man5/postconf.5              |  7 +++++--
 postfix/proto/SMTPD_POLICY_README.html   | 11 +++++++----
 postfix/proto/postconf.proto             |  8 ++++++--
 postfix/src/global/ehlo_mask.c           |  5 +++++
 postfix/src/global/ehlo_mask.h           |  5 +++++
 postfix/src/global/mail_version.h        |  2 +-
 postfix/src/global/smtp_stream.c         |  5 +++++
 postfix/src/global/smtp_stream.h         |  5 +++++
 postfix/src/postscreen/postscreen_send.c |  5 +++++
 postfix/src/smtp/smtp_sasl_glue.c        |  7 ++++++-
 postfix/src/smtpd/smtpd_chat.c           |  5 +++++
 postfix/src/smtpd/smtpd_chat.h           |  5 +++++
 postfix/src/util/vbuf.c                  |  5 +++++
 postfix/src/util/vstring_vstream.c       |  5 +++++
 18 files changed, 96 insertions(+), 20 deletions(-)

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 55140ab9f..554aa5c7d 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -23708,3 +23708,8 @@ Apologies for any names omitted.
 	(default: 12288). Viktor Dukhovni.  Files: mantools/postlink,
 	proto/postconf.proto, global/mail_params.h, smtpd/smtpd.c,
 	smtpd/smtpd_chat.c, smtpd/smtpd_chat.h, smtpd/smtpd_sasl_glue.c.
+
+20180827
+
+	Miscellaneous documentation updates, and a correction in
+	the byte count for sending a large SASL initial response.
diff --git a/postfix/README_FILES/SMTPD_POLICY_README b/postfix/README_FILES/SMTPD_POLICY_README
index d5ad0b3c4..877654292 100644
--- a/postfix/README_FILES/SMTPD_POLICY_README
+++ b/postfix/README_FILES/SMTPD_POLICY_README
@@ -104,11 +104,15 @@ Notes:
 
   * The "recipient" attribute is available in the "RCPT TO" stage. It is also
     available in the "DATA" and "END-OF-MESSAGE" stages if Postfix accepted
-    only one recipient for the current message.
+    only one recipient for the current message. The DATA protocol state also
+    applies to email that is received with BDAT commands (Postfix 3.4 and
+    later).
 
   * The "recipient_count" attribute (Postfix 2.3 and later) is non-zero only in
     the "DATA" and "END-OF-MESSAGE" stages. It specifies the number of
-    recipients that Postfix accepted for the current message.
+    recipients that Postfix accepted for the current message. The DATA protocol
+    state also applies to email that is received with BDAT commands (Postfix
+    3.4 and later).
 
   * The remote client or local server IP address is an IPv4 dotted quad in the
     form 1.2.3.4 or it is an IPv6 address in the form 1:2:3::4:5:6.
@@ -132,8 +136,8 @@ Notes:
 
   * The "size" attribute value specifies the message size that the client
     specified in the MAIL FROM command (zero if none was specified). With
-    Postfix 2.2 and later, it specifies the actual message size when the client
-    sends the END-OF-DATA command.
+    Postfix 2.2 and later, it specifies the actual message size after the
+    client sends the END-OF-MESSAGE.
 
   * The "sasl_*" attributes (Postfix 2.2 and later) specify information about
     how the client was authenticated via SASL. These attributes are empty in
diff --git a/postfix/html/SMTPD_POLICY_README.html b/postfix/html/SMTPD_POLICY_README.html
index 6fb70015c..b0c41ffd9 100644
--- a/postfix/html/SMTPD_POLICY_README.html
+++ b/postfix/html/SMTPD_POLICY_README.html
@@ -143,12 +143,16 @@ server_port=54321
     <li> <p> The "recipient" attribute is available in the "RCPT
     TO" stage. It is also available in the "DATA" and "END-OF-MESSAGE"
     stages if Postfix accepted only one recipient for the current
-    message.  </p>
+    message.
+    The DATA protocol state also applies to email that is received
+    with BDAT commands (Postfix 3.4 and later). </p>
 
     <li> <p> The "recipient_count" attribute (Postfix 2.3 and later)
     is non-zero only in the "DATA" and "END-OF-MESSAGE" stages. It
     specifies the number of recipients that Postfix accepted for
-    the current message.  </p>
+    the current message.
+    The DATA protocol state also applies to email that is received
+    with BDAT commands (Postfix 3.4 and later). </p>
 
     <li> <p> The remote client or local server IP address is an
     IPv4 dotted quad in the form 1.2.3.4 or it is an IPv6 address
@@ -176,8 +180,7 @@ server_port=54321
     <li> <p> The "size" attribute value specifies the message size
     that the client specified in the MAIL FROM command (zero if
     none was specified). With Postfix 2.2 and later, it specifies
-    the actual message size when the client sends the END-OF-DATA
-    command.
+    the actual message size after the client sends the END-OF-MESSAGE.
     </p>
 
     <li> <p> The "sasl_*" attributes (Postfix 2.2 and later) specify
diff --git a/postfix/html/postconf.5.html b/postfix/html/postconf.5.html
index cbc3031ee..5c9cd91a4 100644
--- a/postfix/html/postconf.5.html
+++ b/postfix/html/postconf.5.html
@@ -2274,8 +2274,12 @@ is the <a href="master.5.html">master.cf</a> name of the message delivery transp
 (default: 0s)</b></DT><DD>
 
 <p> The default amount of delay that is inserted between individual
-deliveries to the same destination; the resulting behavior depends
-on the value of the corresponding per-destination recipient limit.
+deliveries to the same destination. If non-zero, all deliveries to
+the same destination will happen one at a time. </p>
+
+<p> The resulting behavior depends on the value of the corresponding
+per-destination recipient limit.
+
 </p>
 
 <ul>
diff --git a/postfix/man/man5/postconf.5 b/postfix/man/man5/postconf.5
index 2a4e29d1d..c47aaab20 100644
--- a/postfix/man/man5/postconf.5
+++ b/postfix/man/man5/postconf.5
@@ -1449,8 +1449,11 @@ is the master.cf name of the message delivery transport.
 This feature is available in Postfix 2.5 and later.
 .SH default_destination_rate_delay (default: 0s)
 The default amount of delay that is inserted between individual
-deliveries to the same destination; the resulting behavior depends
-on the value of the corresponding per\-destination recipient limit.
+deliveries to the same destination. If non\-zero, all deliveries to
+the same destination will happen one at a time.
+.PP
+The resulting behavior depends on the value of the corresponding
+per\-destination recipient limit.
 .IP \(bu
 With a corresponding per\-destination recipient limit >
 1, the rate delay specifies the time between deliveries to the
diff --git a/postfix/proto/SMTPD_POLICY_README.html b/postfix/proto/SMTPD_POLICY_README.html
index ebda427ba..5f5251668 100644
--- a/postfix/proto/SMTPD_POLICY_README.html
+++ b/postfix/proto/SMTPD_POLICY_README.html
@@ -143,12 +143,16 @@ server_port=54321
     <li> <p> The "recipient" attribute is available in the "RCPT
     TO" stage. It is also available in the "DATA" and "END-OF-MESSAGE"
     stages if Postfix accepted only one recipient for the current
-    message.  </p>
+    message.
+    The DATA protocol state also applies to email that is received
+    with BDAT commands (Postfix 3.4 and later). </p>
 
     <li> <p> The "recipient_count" attribute (Postfix 2.3 and later)
     is non-zero only in the "DATA" and "END-OF-MESSAGE" stages. It
     specifies the number of recipients that Postfix accepted for
-    the current message.  </p>
+    the current message.
+    The DATA protocol state also applies to email that is received
+    with BDAT commands (Postfix 3.4 and later). </p>
 
     <li> <p> The remote client or local server IP address is an
     IPv4 dotted quad in the form 1.2.3.4 or it is an IPv6 address
@@ -176,8 +180,7 @@ server_port=54321
     <li> <p> The "size" attribute value specifies the message size
     that the client specified in the MAIL FROM command (zero if
     none was specified). With Postfix 2.2 and later, it specifies
-    the actual message size when the client sends the END-OF-DATA
-    command.
+    the actual message size after the client sends the END-OF-MESSAGE.
     </p>
 
     <li> <p> The "sasl_*" attributes (Postfix 2.2 and later) specify
diff --git a/postfix/proto/postconf.proto b/postfix/proto/postconf.proto
index 7e169b6b2..3f5cc971e 100644
--- a/postfix/proto/postconf.proto
+++ b/postfix/proto/postconf.proto
@@ -13321,8 +13321,12 @@ name is the master.cf name of the message delivery transport. </p>
 %PARAM default_destination_rate_delay 0s
 
 <p> The default amount of delay that is inserted between individual
-deliveries to the same destination; the resulting behavior depends
-on the value of the corresponding per-destination recipient limit.
+deliveries to the same destination. If non-zero, all deliveries to
+the same destination will happen one at a time. </p>
+
+<p> The resulting behavior depends on the value of the corresponding
+per-destination recipient limit.
+
 </p>
 
 <ul>
diff --git a/postfix/src/global/ehlo_mask.c b/postfix/src/global/ehlo_mask.c
index 7ebcb9c2c..4a84718ad 100644
--- a/postfix/src/global/ehlo_mask.c
+++ b/postfix/src/global/ehlo_mask.c
@@ -47,6 +47,11 @@
 /*	IBM T.J. Watson Research
 /*	P.O. Box 704
 /*	Yorktown Heights, NY 10598, USA
+/*
+/*	Wietse Venema
+/*	Google, Inc.
+/*	111 8th Avenue
+/*	New York, NY 10011, USA
 /*--*/
 
 /* System library.*/
diff --git a/postfix/src/global/ehlo_mask.h b/postfix/src/global/ehlo_mask.h
index ed0f7dc02..9a318970d 100644
--- a/postfix/src/global/ehlo_mask.h
+++ b/postfix/src/global/ehlo_mask.h
@@ -43,6 +43,11 @@ extern const char *str_ehlo_mask(int);
 /*	IBM T.J. Watson Research
 /*	P.O. Box 704
 /*	Yorktown Heights, NY 10598, USA
+/*
+/*	Wietse Venema
+/*	Google, Inc.
+/*	111 8th Avenue
+/*	New York, NY 10011, USA
 /*--*/
 
 #endif
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 4821e002f..237f02748 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	"20180826"
+#define MAIL_RELEASE_DATE	"20180827"
 #define MAIL_VERSION_NUMBER	"3.4"
 
 #ifdef SNAPSHOT
diff --git a/postfix/src/global/smtp_stream.c b/postfix/src/global/smtp_stream.c
index 367dcb1d4..93d66f253 100644
--- a/postfix/src/global/smtp_stream.c
+++ b/postfix/src/global/smtp_stream.c
@@ -166,6 +166,11 @@
 /*	IBM T.J. Watson Research
 /*	P.O. Box 704
 /*	Yorktown Heights, NY 10598, USA
+/*
+/*	Wietse Venema
+/*	Google, Inc.
+/*	111 8th Avenue
+/*	New York, NY 10011, USA
 /*--*/
 
 /* System library. */
diff --git a/postfix/src/global/smtp_stream.h b/postfix/src/global/smtp_stream.h
index cd2bfce69..3df6180f2 100644
--- a/postfix/src/global/smtp_stream.h
+++ b/postfix/src/global/smtp_stream.h
@@ -62,6 +62,11 @@ extern void smtp_vprintf(VSTREAM *, const char *, va_list);
 /*	IBM T.J. Watson Research
 /*	P.O. Box 704
 /*	Yorktown Heights, NY 10598, USA
+/*
+/*	Wietse Venema
+/*	Google, Inc.
+/*	111 8th Avenue
+/*	New York, NY 10011, USA
 /*--*/
 
 #endif
diff --git a/postfix/src/postscreen/postscreen_send.c b/postfix/src/postscreen/postscreen_send.c
index 69a7fd721..53714b15d 100644
--- a/postfix/src/postscreen/postscreen_send.c
+++ b/postfix/src/postscreen/postscreen_send.c
@@ -52,6 +52,11 @@
 /*	IBM T.J. Watson Research
 /*	P.O. Box 704
 /*	Yorktown Heights, NY 10598, USA
+/*
+/*	Wietse Venema
+/*	Google, Inc.
+/*	111 8th Avenue
+/*	New York, NY 10011, USA
 /*--*/
 
 /* System library. */
diff --git a/postfix/src/smtp/smtp_sasl_glue.c b/postfix/src/smtp/smtp_sasl_glue.c
index f86bcd9e2..ef8e8c442 100644
--- a/postfix/src/smtp/smtp_sasl_glue.c
+++ b/postfix/src/smtp/smtp_sasl_glue.c
@@ -89,6 +89,11 @@
 /*	IBM T.J. Watson Research
 /*	P.O. Box 704
 /*	Yorktown Heights, NY 10598, USA
+/*
+/*	Wietse Venema
+/*	Google, Inc.
+/*	111 8th Avenue
+/*	New York, NY 10011, USA
 /*--*/
 
  /*
@@ -374,7 +379,7 @@ int     smtp_sasl_authenticate(SMTP_SESSION *session, DSN_BUF *why)
      * Defer the initial response if the resulting command exceeds the limit.
      */
     if (LEN(session->sasl_reply) > 0
-	&& strlen(mechanism) + LEN(session->sasl_reply) + 4 <= 512) {
+	&& strlen(mechanism) + LEN(session->sasl_reply) + 8 <= 512) {
 	smtp_chat_cmd(session, "AUTH %s %s", mechanism,
 		      STR(session->sasl_reply));
 	VSTRING_RESET(session->sasl_reply);	/* no deferred initial reply */
diff --git a/postfix/src/smtpd/smtpd_chat.c b/postfix/src/smtpd/smtpd_chat.c
index 295563e47..63795b861 100644
--- a/postfix/src/smtpd/smtpd_chat.c
+++ b/postfix/src/smtpd/smtpd_chat.c
@@ -65,6 +65,11 @@
 /*	IBM T.J. Watson Research
 /*	P.O. Box 704
 /*	Yorktown Heights, NY 10598, USA
+/*
+/*	Wietse Venema
+/*	Google, Inc.
+/*	111 8th Avenue
+/*	New York, NY 10011, USA
 /*--*/
 
 /* System library. */
diff --git a/postfix/src/smtpd/smtpd_chat.h b/postfix/src/smtpd/smtpd_chat.h
index 6b3a5472c..9fbe178ff 100644
--- a/postfix/src/smtpd/smtpd_chat.h
+++ b/postfix/src/smtpd/smtpd_chat.h
@@ -37,4 +37,9 @@ extern void smtpd_chat_notify(SMTPD_STATE *);
 /*	IBM T.J. Watson Research
 /*	P.O. Box 704
 /*	Yorktown Heights, NY 10598, USA
+/*
+/*	Wietse Venema
+/*	Google, Inc.
+/*	111 8th Avenue
+/*	New York, NY 10011, USA
 /*--*/
diff --git a/postfix/src/util/vbuf.c b/postfix/src/util/vbuf.c
index ecc6f197b..924e230ad 100644
--- a/postfix/src/util/vbuf.c
+++ b/postfix/src/util/vbuf.c
@@ -140,6 +140,11 @@
 /*	IBM T.J. Watson Research
 /*	P.O. Box 704
 /*	Yorktown Heights, NY 10598, USA
+/*
+/*	Wietse Venema
+/*	Google, Inc.
+/*	111 8th Avenue
+/*	New York, NY 10011, USA
 /*--*/
 
 /* System library. */
diff --git a/postfix/src/util/vstring_vstream.c b/postfix/src/util/vstring_vstream.c
index 6c39140d5..5e725f0a3 100644
--- a/postfix/src/util/vstring_vstream.c
+++ b/postfix/src/util/vstring_vstream.c
@@ -100,6 +100,11 @@
 /*	IBM T.J. Watson Research
 /*	P.O. Box 704
 /*	Yorktown Heights, NY 10598, USA
+/*
+/*	Wietse Venema
+/*	Google, Inc.
+/*	111 8th Avenue
+/*	New York, NY 10011, USA
 /*--*/
 
 /* System library. */