From e80a7aa8392a948eea1f7e8f7704de46f3b36056 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sun, 5 Feb 2012 21:59:14 +0100
Subject: [PATCH] SMTP-Client: after a successfully FROM don't try secondary
 host.

---
 citadel/modules/smtp/serv_smtpeventclient.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c
index 3f3dcd3d0..d0e3a216b 100644
--- a/citadel/modules/smtp/serv_smtpeventclient.c
+++ b/citadel/modules/smtp/serv_smtpeventclient.c
@@ -631,7 +631,10 @@ eNextState SMTP_C_Timeout(AsyncIO *IO)
 	Msg->MyQEntry->Status = 4;
 	EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
 	StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[Msg->State]));
-	return FailOneAttempt(IO);
+	if (Msg->State > eRCPT)
+		return eAbort;
+	else
+		return FailOneAttempt(IO);
 }
 eNextState SMTP_C_ConnFail(AsyncIO *IO)
 {
-- 
2.30.2