postfix-3.4.1-RC1

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 4540a81daf68606d16727a4977416a84623163df..775946233ed851e89c94f4a1337457371fc6ffa4 100644 (file)
--- 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 2c37eb68ee054373da8b7ead469f082cb8aa056e..63743fc748e1d3bef3eeaf46c093c4eedce89231 100644 (file)
--- 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 9568c79ded74f01883b1df8ed5838b11887d73b7..182f2f7341d07d90e5ec070ec88bf644bc778fe6 100644 (file)
--- 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