X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtpeventclient.c;h=9e97dda97aed2e8660abb7b31cf1d46b3d0e83f1;hb=81c6612b5c71982c28057c30c42ce4cbb8120eaf;hp=56deb4f5034f1785952ea0e6cf6ca4b6830bfdb9;hpb=5184399673cc3554c0331b6fe862dcf45859fc22;p=citadel.git

diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c
index 56deb4f50..9e97dda97 100644
--- a/citadel/modules/smtp/serv_smtpeventclient.c
+++ b/citadel/modules/smtp/serv_smtpeventclient.c
@@ -237,6 +237,13 @@ eNextState FailOneAttempt(AsyncIO *IO)
 
 	if (Msg->pCurrRelay != NULL)
 		Msg->pCurrRelay = Msg->pCurrRelay->Next;
+	if ((Msg->pCurrRelay != NULL) &&
+	    !Msg->pCurrRelay->IsRelay &&
+	    Msg->MyQItem->HaveRelay)
+	{
+		EVS_syslog(LOG_DEBUG, "%s Aborting; last relay failed.\n", __FUNCTION__);
+		return eAbort;
+	}
 
 	if (Msg->pCurrRelay == NULL) {
 		EVS_syslog(LOG_DEBUG, "%s Aborting\n", __FUNCTION__);