From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Sun, 19 Feb 2017 22:26:28 +0000 (+0200)
Subject: lib-mail: Fix matched-parameter in HEADER_FILTER_ADD_MISSING_EOH callback
X-Git-Tag: 2.2.28.rc1~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a63de62c8ca0a04ce8805b72919f129e20aab60;p=thirdparty%2Fdovecot%2Fcore.git

lib-mail: Fix matched-parameter in HEADER_FILTER_ADD_MISSING_EOH callback

The matched-parameter in the regular EOH callback is the reverse of what
it's in v2.3 tree. So preserve it here.
---

diff --git a/src/lib-mail/istream-header-filter.c b/src/lib-mail/istream-header-filter.c
index 6f00e5e9a7..566e042551 100644
--- a/src/lib-mail/istream-header-filter.c
+++ b/src/lib-mail/istream-header-filter.c
@@ -306,7 +306,7 @@ static ssize_t read_header(struct header_filter_istream *mstream)
 			return -1;
 		}
 		if (!mstream->seen_eoh && mstream->add_missing_eoh) {
-			bool matched = FALSE;
+			bool matched = TRUE;
 
 			mstream->seen_eoh = TRUE;
 
@@ -326,7 +326,7 @@ static ssize_t read_header(struct header_filter_istream *mstream)
 				mstream->callbacks_called = TRUE;
 			}
 
-			if (matched) {
+			if (!matched) {
 				mstream->seen_eoh = FALSE;
 			} else {
 				add_eol(mstream, mstream->last_orig_crlf);