SMTP-Client: after a successfully FROM don't try secondary host.

diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c
index 3f3dcd3d0004c605fd0b5db2f41975b34fc3f859..d0e3a216bfbaad05c78abc5f928274a9e6338fd7 100644 (file)
--- 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)
 {