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

postfix-3.4.1-RC1
---

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 4540a81da..775946233 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -24162,3 +24162,10 @@ Apologies for any names omitted.
 	tested in tlsproxy mode. It needed some setup for buffering
 	and timeouts. Problem report by Andreas Schulze. File:
 	smtp/smtp_proto.c.
+
+20190304
+
+	Bugfix: a reversed test broke TLS configurations that have
+	the private key and certificate in the same file. Reported
+	by Mike Kazantsev. Fix by Viktor Dukhovni. File:
+	tls/tls_certkey.c.
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 2c37eb68e..63743fc74 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	"20190227"
-#define MAIL_VERSION_NUMBER	"3.4.0"
+#define MAIL_RELEASE_DATE	"20190304"
+#define MAIL_VERSION_NUMBER	"3.4.1-RC1"
 
 #ifdef SNAPSHOT
 #define MAIL_VERSION_DATE	"-" MAIL_RELEASE_DATE
diff --git a/postfix/src/tls/tls_certkey.c b/postfix/src/tls/tls_certkey.c
index 9568c79de..182f2f734 100644
--- a/postfix/src/tls/tls_certkey.c
+++ b/postfix/src/tls/tls_certkey.c
@@ -589,7 +589,7 @@ static int set_cert_stuff(SSL_CTX *ctx, const char *cert_type,
      * single pass, avoiding potential race conditions during key rollover.
      */
     if (strcmp(cert_file, key_file) == 0)
-	return (load_mixed_file(ctx, cert_file));
+	return (load_mixed_file(ctx, cert_file) == 0);
 
     /*
      * We need both the private key (in key_file) and the public key