SMTP-Client: on success strip reply too.

[citadel.git] / citadel / modules / smtp / smtp_clienthandlers.c

diff --git a/citadel/modules/smtp/smtp_clienthandlers.c b/citadel/modules/smtp/smtp_clienthandlers.c
index 0a01805c6dae39dd9430b038d7dbd03977a638ea..e7ccae385bf33a4acef572684847d623b9eec916 100644 (file)
--- a/citadel/modules/smtp/smtp_clienthandlers.c
+++ b/citadel/modules/smtp/smtp_clienthandlers.c
@@ -92,6 +92,7 @@
                Msg->MyQEntry->Status = WHICH_ERR;                     \
                StrBufAppendBufPlain(Msg->MyQEntry->StatusMessage,     \
                                     HKEY(ERRSTR), 0);                 \
+               StrBufTrim(Msg->MyQEntry->StatusMessage);              \
                return eAbort; }                                       \
        while (0)
 
@@ -100,16 +101,17 @@
                StrBufPlain(Msg->MyQEntry->StatusMessage,      \
                            ChrPtr(Msg->IO.IOBuf) + 4,         \
                            StrLength(Msg->IO.IOBuf) - 4);     \
+               StrBufTrim(Msg->MyQEntry->StatusMessage);      \
                return eAbort; }                               \
        while (0)
 
 #define SMTP_IS_STATE(WHICH_STATE) (ChrPtr(Msg->IO.IOBuf)[0] == WHICH_STATE)
 
 #define SMTP_DBG_SEND() \
-       EVS_syslog(LOG_DEBUG, "SMTP: > %s\n", ChrPtr(Msg->IO.SendBuf.Buf))
+       EVS_syslog(LOG_DEBUG, "> %s\n", ChrPtr(Msg->IO.SendBuf.Buf))
 
 #define SMTP_DBG_READ() \
-       EVS_syslog(LOG_DEBUG, "SMTP: < %s\n", ChrPtr(Msg->IO.IOBuf))
+       EVS_syslog(LOG_DEBUG, "< %s\n", ChrPtr(Msg->IO.IOBuf))
 
 
 /*****************************************************************************/
@@ -354,6 +356,7 @@ eNextState SMTPC_read_data_body_reply(SmtpOutMsg *Msg)
        StrBufPlain(Msg->MyQEntry->StatusMessage,
                    &ChrPtr(Msg->IO.RecvBuf.Buf)[4],
                    StrLength(Msg->IO.RecvBuf.Buf) - 4);
+       StrBufTrim(Msg->MyQEntry->StatusMessage);
        Msg->MyQEntry->Status = 2;
        return eSendReply;
 }
@@ -374,8 +377,7 @@ eNextState SMTPC_read_QUIT_reply(SmtpOutMsg *Msg)
        SMTP_DBG_READ();
 
        EVS_syslog(LOG_DEBUG,
-                  "SMTP client[%ld]: delivery to <%s> @ <%s> (%s) succeeded\n",
-                  Msg->n,
+                  "delivery to <%s> @ <%s> (%s) succeeded\n",
                   Msg->user,
                   Msg->node,
                   Msg->name);
@@ -475,7 +477,7 @@ int smtp_resolve_recipients(SmtpOutMsg *Msg)
        int lp, rp;
        int i;
 
-       EVNCS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+       EVNCS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
 
        if ((Msg==NULL) ||
            (Msg->MyQEntry == NULL) ||
@@ -490,9 +492,7 @@ int smtp_resolve_recipients(SmtpOutMsg *Msg)
                            Msg->name);
 
        EVNCS_syslog(LOG_DEBUG,
-                    "SMTP client[%ld]: Attempting delivery to "
-                    "<%s> @ <%s> (%s)\n",
-                    Msg->n,
+                    "Attempting delivery to <%s> @ <%s> (%s)\n",
                     Msg->user,
                     Msg->node,
                     Msg->name);