#define SMTP_ERROR(WHICH_ERR, ERRSTR) do { \
Msg->MyQEntry->Status = WHICH_ERR; \
- StrBufAppendBufPlain(Msg->MyQEntry->StatusMessage, \
+ StrBufAppendBufPlain(Msg->MyQEntry->StatusMessage, \
HKEY(ERRSTR), 0); \
+ StrBufTrim(Msg->MyQEntry->StatusMessage); \
return eAbort; } \
while (0)
#define SMTP_VERROR(WHICH_ERR) do { \
Msg->MyQEntry->Status = WHICH_ERR; \
- StrBufPlain(Msg->MyQEntry->StatusMessage, \
- ChrPtr(Msg->IO.IOBuf) + 4, \
- StrLength(Msg->IO.IOBuf) - 4); \
+ 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))
/*****************************************************************************/
/* Process the SMTP greeting from the server */
AsyncIO *IO = &Msg->IO;
SMTP_DBG_READ();
+ SetSMTPState(IO, eSTMPsmtp);
if (!SMTP_IS_STATE('2')) {
if (SMTP_IS_STATE('4'))
SMTP_DBG_READ();
if (!SMTP_IS_STATE('3')) {
+ SetSMTPState(IO, eSTMPfailOne);
if (SMTP_IS_STATE('4'))
SMTP_VERROR(3);
else
SMTP_VERROR(5);
}
+ SetSMTPState(IO, eSTMPsmtpdata);
return eSendReply;
}
SMTP_VERROR(5);
}
+ SetSMTPState(IO, eSTMPsmtpdone);
/* We did it! */
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;
}
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);
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) ||
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);