From: Wietse Venema <wietse@porcupine.org>
Date: Sun, 10 Mar 2019 05:00:00 +0000 (-0500)
Subject: postfix-3.4.2
X-Git-Tag: v3.4.2^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04c1fa4f0098019980d79c945a3295d161a65189;p=thirdparty%2Fpostfix.git

postfix-3.4.2
---

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 9839a370f..3dbbb3613 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -24169,3 +24169,20 @@ Apologies for any names omitted.
 	the same filename for a private key and certificate. Reported
 	by Mike Kazantsev. Fix by Viktor Dukhovni. Wietse fixed the
 	test. Files: tls/tls_certkey.c, tls/Makefile.in.
+
+20190310
+
+	Bitrot: LINUX5s support, after some sanity checks with a
+	rawhide prerelease version. Files: makedefs, util/sys_defs.h.
+
+	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.
+
+	Bugfix (introduced: Postfix-1.0.1): null pointer read, while
+	logging a warning after a corrupted bounce log file. File:
+	global/bounce_log.c.
+
+	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
diff --git a/postfix/src/global/bounce_log.c b/postfix/src/global/bounce_log.c
index 6f8f5111e..198f2405d 100644
--- a/postfix/src/global/bounce_log.c
+++ b/postfix/src/global/bounce_log.c
@@ -264,7 +264,7 @@ BOUNCE_LOG *bounce_log_read(BOUNCE_LOG *bp, RCPT_BUF *rcpt_buf,
 	recipient = cp + 1;
 	if ((cp = strstr(recipient, ">: ")) == 0) {
 	    msg_warn("%s: malformed record: %.30s...",
-		     VSTREAM_PATH(bp->fp), cp);
+		     VSTREAM_PATH(bp->fp), recipient - 1);
 	    continue;
 	}
 	*cp = 0;
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 7ae7c01b8..39bbe27d6 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	"20190307"
-#define MAIL_VERSION_NUMBER	"3.4.1"
+#define MAIL_RELEASE_DATE	"20190310"
+#define MAIL_VERSION_NUMBER	"3.4.2"
 
 #ifdef SNAPSHOT
 #define MAIL_VERSION_DATE	"-" MAIL_RELEASE_DATE
diff --git a/postfix/src/postscreen/postscreen_smtpd.c b/postfix/src/postscreen/postscreen_smtpd.c
index af3525fe7..78392072f 100644
--- a/postfix/src/postscreen/postscreen_smtpd.c
+++ b/postfix/src/postscreen/postscreen_smtpd.c
@@ -939,7 +939,8 @@ static void psc_smtpd_read_event(int event, void *context)
 		vstring_strcpy(state->cmd_buffer, cp);
 	    } else if (psc_cmd_filter->error != 0) {
 		msg_fatal("%s:%s lookup error for \"%.100s\"",
-			  psc_cmd_filter->type, psc_cmd_filter->name, cp);
+			  psc_cmd_filter->type, psc_cmd_filter->name,
+			  STR(state->cmd_buffer));
 	    }
 	}
 
diff --git a/postfix/src/tls/tls_dane.c b/postfix/src/tls/tls_dane.c
index 93f8e2a52..013426b11 100644
--- a/postfix/src/tls/tls_dane.c
+++ b/postfix/src/tls/tls_dane.c
@@ -1125,7 +1125,6 @@ TLS_DANE *tls_dane_resolve(unsigned port, const char *proto, DNS_RR *hostrr,
 
 int     tls_dane_load_trustfile(TLS_DANE *dane, const char *tafile)
 {
-#ifdef TRUST_ANCHOR_SUPPORT
     BIO    *bp;
     char   *name = 0;
     char   *header = 0;
@@ -1217,9 +1216,6 @@ int     tls_dane_load_trustfile(TLS_DANE *dane, const char *tafile)
     }
     /* Some other PEM read error */
     tls_print_errors();
-#else
-    msg_warn("Trust anchor files not supported");
-#endif
     return (0);
 }
 
diff --git a/postfix/src/util/sys_defs.h b/postfix/src/util/sys_defs.h
index a8d257126..39daa16d0 100644
--- a/postfix/src/util/sys_defs.h
+++ b/postfix/src/util/sys_defs.h
@@ -749,7 +749,7 @@ extern int initgroups(const char *, int);
  /*
   * LINUX.
   */
-#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4)
+#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4) || defined(LINUX5)
 #define SUPPORTED
 #define UINT32_TYPE	unsigned int
 #define UINT16_TYPE	unsigned short