From: Sergey Kitov <sergey.kitov@open-xchange.com>
Date: Wed, 14 Jun 2017 07:44:01 +0000 (+0300)
Subject: lib-imap: imap_write_envelope changed to skip CRs and LFs.
X-Git-Tag: 2.2.31.rc1~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1618fcbcd89427754b4027e1732f9da5aec17fbc;p=thirdparty%2Fdovecot%2Fcore.git

lib-imap: imap_write_envelope changed to skip CRs and LFs.
---

diff --git a/src/lib-imap/imap-envelope.c b/src/lib-imap/imap-envelope.c
index 258144142b..64f02669cf 100644
--- a/src/lib-imap/imap-envelope.c
+++ b/src/lib-imap/imap-envelope.c
@@ -55,7 +55,7 @@ void imap_envelope_write(struct message_part_envelope *data,
 		return;
 	}
 
-	imap_append_nstring(str, data->date);
+	imap_append_nstring_nolf(str, data->date);
 	str_append_c(str, ' ');
 	if (data->subject == NULL)
 		str_append(str, "NIL");
@@ -79,9 +79,9 @@ void imap_envelope_write(struct message_part_envelope *data,
 	imap_write_address(str, data->bcc);
 
 	str_append_c(str, ' ');
-	imap_append_nstring(str, data->in_reply_to);
+	imap_append_nstring_nolf(str, data->in_reply_to);
 	str_append_c(str, ' ');
-	imap_append_nstring(str, data->message_id);
+	imap_append_nstring_nolf(str, data->message_id);
 }
 
 /*