From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sun, 19 Aug 2012 16:45:33 +0000 (+0200)
Subject: SMTP-Client: add the current hostname we're talking to to the status.
X-Git-Tag: v8.20~251
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=30eb28c7fe75da83b9763b854e294ed39424a0d7;hp=f77abc65a2ec7e662ac383a9fc3a9739d1142b2d;p=citadel.git

SMTP-Client: add the current hostname we're talking to to the status.
---

diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c
index c744bb6e4..bb11522c1 100644
--- a/citadel/modules/smtp/serv_smtpeventclient.c
+++ b/citadel/modules/smtp/serv_smtpeventclient.c
@@ -774,7 +774,9 @@ eNextState SMTP_C_Timeout(AsyncIO *IO)
 
 	Msg->MyQEntry->Status = 4;
 	EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
-	StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[Msg->State]));
+	StrBufPrintf(IO->ErrMsg, "Timeout: %s while talking to %s",
+		     ReadErrors[Msg->State].Key,
+		     Msg->mx_host);
 	if (Msg->State > eRCPT)
 		return eAbort;
 	else
@@ -786,7 +788,10 @@ eNextState SMTP_C_ConnFail(AsyncIO *IO)
 
 	Msg->MyQEntry->Status = 4;
 	EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
-	StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[Msg->State]));
+	StrBufPrintf(IO->ErrMsg, "Connection failure: %s while talking to %s",
+		     ReadErrors[Msg->State].Key,
+		     Msg->mx_host);
+
 	return FailOneAttempt(IO);
 }
 eNextState SMTP_C_DNSFail(AsyncIO *IO)