Msg->MyQEntry->Status = WHICH_ERR; \
StrBufAppendBufPlain(Msg->MyQEntry->StatusMessage, \
HKEY(ERRSTR), 0); \
+ StrBufTrim(Msg->MyQEntry->StatusMessage); \
return eAbort; } \
while (0)
StrBufPlain(Msg->MyQEntry->StatusMessage, \
ChrPtr(Msg->IO.IOBuf) + 4, \
StrLength(Msg->IO.IOBuf) - 4); \
+ StrBufTrim(Msg->MyQEntry->StatusMessage); \
return eAbort; } \
while (0)
/* 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'))
if ((Msg->pCurrRelay == NULL) ||
(Msg->pCurrRelay->User == NULL))
Msg->State ++; /* Skip auth... */
+ if (Msg->pCurrRelay != NULL)
+ {
+ if (strstr(ChrPtr(Msg->IO.IOBuf), "LOGIN") != NULL)
+ Msg->SendLogin = 1;
+ }
}
/* else we fall back to 'helo' */
return eSendReply;
else
SMTP_VERROR(5);
}
+ if (Msg->pCurrRelay != NULL)
+ {
+ if (strstr(ChrPtr(Msg->IO.IOBuf), "LOGIN") != NULL)
+ Msg->SendLogin = 1;
+ }
if ((Msg->pCurrRelay == NULL) ||
(Msg->pCurrRelay->User == NULL))
Msg->State ++; /* Skip auth... */
Msg->State ++; /* Skip auth, shouldn't even come here!... */
else {
/* Do an AUTH command if necessary */
- sprintf(buf, "%s%c%s%c%s",
- Msg->pCurrRelay->User, '\0',
- Msg->pCurrRelay->User, '\0',
- Msg->pCurrRelay->Pass);
-
- CtdlEncodeBase64(encoded, buf,
- strlen(Msg->pCurrRelay->User) * 2 +
- strlen(Msg->pCurrRelay->Pass) + 2, 0);
-
- StrBufPrintf(Msg->IO.SendBuf.Buf,
- "AUTH PLAIN %s\r\n", encoded);
+ if (Msg->SendLogin)
+ {
+ sprintf(buf, "%s",
+ Msg->pCurrRelay->User);
+
+ CtdlEncodeBase64(encoded, buf,
+ strlen(Msg->pCurrRelay->User) * 2 +
+ strlen(Msg->pCurrRelay->Pass) + 2, 0);
+
+ StrBufPrintf(Msg->IO.SendBuf.Buf,
+ "AUTH LOGIN %s\r\n",
+ encoded);
+ sprintf(buf, "%s",
+ Msg->pCurrRelay->Pass);
+
+ CtdlEncodeBase64(encoded, buf,
+ strlen(Msg->pCurrRelay->User) * 2 +
+ strlen(Msg->pCurrRelay->Pass) + 2, 0);
+
+ StrBufAppendPrintf(Msg->IO.SendBuf.Buf,
+ "%s\r\n",
+ encoded);
+ }
+ else
+ {
+ sprintf(buf, "%s%c%s%c%s",
+ Msg->pCurrRelay->User, '\0',
+ Msg->pCurrRelay->User, '\0',
+ Msg->pCurrRelay->Pass);
+
+ CtdlEncodeBase64(encoded, buf,
+ strlen(Msg->pCurrRelay->User) * 2 +
+ strlen(Msg->pCurrRelay->Pass) + 2, 0);
+
+ StrBufPrintf(Msg->IO.SendBuf.Buf,
+ "AUTH PLAIN %s\r\n",
+ encoded);
+ }
}
SMTP_DBG_SEND();
return eReadMessage;
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;
}