From d5f27c0050c5ec1fac4925638634d9d747b42145 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <dothebart@citadel.org>
Date: Tue, 7 Feb 2012 22:55:45 +0100
Subject: [PATCH] SMTP-Client: assign error status buffer on initialisation, so
 our bounce message also contains DNS-Failures.

---
 citadel/modules/smtp/serv_smtpeventclient.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c
index 911474668..3a65977ff 100644
--- a/citadel/modules/smtp/serv_smtpeventclient.c
+++ b/citadel/modules/smtp/serv_smtpeventclient.c
@@ -152,7 +152,7 @@ void FinalizeMessageSend(SmtpOutMsg *Msg)
 	CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, &Msg->MyQItem->QueMsgID, 1, "");
 
 	if (IDestructQueItem)
-		smtpq_do_bounce(Msg->MyQItem,Msg->msgtext);
+		smtpq_do_bounce(Msg->MyQItem, Msg->msgtext);
 
 	if (nRemain > 0)
 	{
@@ -379,7 +379,6 @@ eNextState smtp_resolve_mx_record_done(AsyncIO *IO)
 	if ((IO->DNS.Query->DNSStatus == ARES_SUCCESS) &&
 	    (IO->DNS.Query->VParsedDNSReply != NULL))
 	{ /* ok, we found mx records. */
-		Msg->IO.ErrMsg = Msg->MyQEntry->StatusMessage;
 
 		Msg->CurrMX
 			= Msg->AllMX
@@ -478,6 +477,8 @@ SmtpOutMsg *new_smtp_outmsg(OneQueItem *MyQItem,
 		     SMTP_C_Timeout,
 		     SMTP_C_Shutdown);
 
+	Msg->IO.ErrMsg = Msg->MyQEntry->StatusMessage;
+
 	return Msg;
 }
 
-- 
2.30.2