From: Wietse Venema <wietse@porcupine.org>
Date: Tue, 12 Mar 2019 05:00:00 +0000 (-0500)
Subject: postfix-3.4.4-RC1
X-Git-Tag: v3.4.4-RC1^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d06315c9330e5aeb78b8a5221a9756450af24f9;p=thirdparty%2Fpostfix.git

postfix-3.4.4-RC1
---

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 3dbbb3613..73b5956eb 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -24177,7 +24177,7 @@ Apologies for any names omitted.
 
 	Bugfix (introduced: 20181226): broken DANE trust anchor
 	file support, caused by left-over debris from the 20181226
-	TLS library overhaul. Scott Kitterman. File: tls/tls_dane.c.
+	TLS library overhaul. By intrigeri. File: tls/tls_dane.c.
 
 	Bugfix (introduced: Postfix-1.0.1): null pointer read, while
 	logging a warning after a corrupted bounce log file. File:
@@ -24186,3 +24186,12 @@ Apologies for any names omitted.
 	Bugfix (introduced: Postfix-2.9.0): null pointer read, while
 	logging a warning after a postscreen_command_filter read
 	error. File: postscreen/postscreen_smtpd.c. global/bounce_log.c
+
+20190312
+
+	Bugfix (introduced: Postfix 2.2): reject_multi_recipient_bounce
+	produce false rejects with smtpd_end_of_data_restrictons,
+	and for the same reasons, with the Postfix 3.4 BDAT command.
+	The latter was reported by Andreas Schulze. File:
+	smtpd/smtpd_check.c.
+
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 6396aab73..d086a2f7f 100644
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,8 +20,8 @@
   * Patches change both the patchlevel and the release date. Snapshots have no
   * patchlevel; they change the release date only.
   */
-#define MAIL_RELEASE_DATE	"20190310"
-#define MAIL_VERSION_NUMBER	"3.4.3"
+#define MAIL_RELEASE_DATE	"20190312"
+#define MAIL_VERSION_NUMBER	"3.4.4-RC1"
 
 #ifdef SNAPSHOT
 #define MAIL_VERSION_DATE	"-" MAIL_RELEASE_DATE
diff --git a/postfix/src/smtpd/smtpd_check.c b/postfix/src/smtpd/smtpd_check.c
index f78d56cf7..d1caa5ca4 100644
--- a/postfix/src/smtpd/smtpd_check.c
+++ b/postfix/src/smtpd/smtpd_check.c
@@ -4583,7 +4583,7 @@ static int generic_checks(SMTPD_STATE *state, ARGV *restrictions,
 		status = check_recipient_rcpt_maps(state, state->recipient);
 	} else if (strcasecmp(name, REJECT_MUL_RCPT_BOUNCE) == 0) {
 	    if (state->sender && *state->sender == 0 && state->rcpt_count
-		> (strcmp(state->where, SMTPD_CMD_DATA) ? 0 : 1))
+		> (strcmp(state->where, SMTPD_CMD_RCPT) != 0))
 		status = smtpd_check_reject(state, MAIL_ERROR_POLICY,
 					    var_mul_rcpt_code, "5.5.3",
 				"<%s>: %s rejected: Multi-recipient bounce",