X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtpeventclient.c;h=d0e3a216bfbaad05c78abc5f928274a9e6338fd7;hb=e80a7aa8392a948eea1f7e8f7704de46f3b36056;hp=3f3dcd3d0004c605fd0b5db2f41975b34fc3f859;hpb=e4a9406f556e9f399a7e7a5f8278387508be9f7b;p=citadel.git

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)
 {