From: Wilfried Goesgens <dothebart@citadel.org>
Date: Mon, 29 Dec 2014 10:45:58 +0000 (+0100)
Subject: SMTP-Client: while evaluating failed attempts:
X-Git-Tag: v9.01~68
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=14ae69b1867d3dba28bb5db9a62cd280d01217b3

SMTP-Client: while evaluating failed attempts:
  - if we decide to fail complete, finalize the sending of the message.
---

diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c
index a9317105d..337aa494b 100644
--- a/citadel/modules/smtp/serv_smtpeventclient.c
+++ b/citadel/modules/smtp/serv_smtpeventclient.c
@@ -288,12 +288,12 @@ eNextState FailOneAttempt(AsyncIO *IO)
 	    Msg->MyQItem->HaveRelay)
 	{
 		EVS_syslog(LOG_DEBUG, "%s Aborting; last relay failed.\n", __FUNCTION__);
-		return eAbort;
+		return FinalizeMessageSend(Msg);
 	}
 
 	if (Msg->pCurrRelay == NULL) {
 		EVS_syslog(LOG_DEBUG, "%s Aborting\n", __FUNCTION__);
-		return eAbort;
+		return FinalizeMessageSend(Msg);
 	}
 	if (Msg->pCurrRelay->IsIP) {
 		EVS_syslog(LOG_DEBUG, "%s connecting IP\n", __FUNCTION__);