From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sat, 5 May 2012 15:16:13 +0000 (+0200)
Subject: SMTP-Client: strip newlines from smtp replies when setting them as Statusmessage.
X-Git-Tag: v8.11~37
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=aa8b1021b70043469d32645ea2961794fbccaa32

SMTP-Client: strip newlines from smtp replies when setting them as Statusmessage.
---

diff --git a/citadel/modules/smtp/smtp_clienthandlers.c b/citadel/modules/smtp/smtp_clienthandlers.c
index c974e822b..1d84fc059 100644
--- a/citadel/modules/smtp/smtp_clienthandlers.c
+++ b/citadel/modules/smtp/smtp_clienthandlers.c
@@ -92,6 +92,7 @@
 		Msg->MyQEntry->Status = WHICH_ERR;		       \
 		StrBufAppendBufPlain(Msg->MyQEntry->StatusMessage,     \
 				     HKEY(ERRSTR), 0);		       \
+		StrBufTrim(Msg->MyQEntry->StatusMessage);	       \
 		return eAbort; }				       \
 	while (0)
 
@@ -100,6 +101,7 @@
 		StrBufPlain(Msg->MyQEntry->StatusMessage,      \
 			    ChrPtr(Msg->IO.IOBuf) + 4,	       \
 			    StrLength(Msg->IO.IOBuf) - 4);     \
+		StrBufTrim(Msg->MyQEntry->StatusMessage);      \
 		return eAbort; }			       \
 	while (0)