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 a9317105dc123053b0d101fbe577e8a0755e7b8e..337aa494bebcead232688fdf6b0c3691b9ec9d08 100644 (file)
--- 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__);