* RFC 2822 - Internet Message Format
* RFC 2920 - SMTP Service Extension for Command Pipelining
*
- * Copyright (c) 1998-2012 by the citadel.org team
+ * Copyright (c) 1998-2015 by the citadel.org team
*
- * This program is open source software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3.
- *
- *
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- *
- *
- *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*/
#include "sysdep.h"
#define SMTP_IS_STATE(WHICH_STATE) (ChrPtr(Msg->IO.IOBuf)[0] == WHICH_STATE)
#define SMTP_DBG_SEND() \
- EVS_syslog(LOG_DEBUG, "> %s\n", ChrPtr(Msg->IO.SendBuf.Buf))
+ syslog(LOG_DEBUG, "> %s\n", ChrPtr(Msg->IO.SendBuf.Buf))
#define SMTP_DBG_READ() \
- EVS_syslog(LOG_DEBUG, "< %s\n", ChrPtr(Msg->IO.IOBuf))
+ syslog(LOG_DEBUG, "< %s\n", ChrPtr(Msg->IO.IOBuf))
/*
* if a Read handler wants to skip to a specific part use this macro.
eNextState SMTPC_send_EHLO(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
/* At this point we know we are talking to a real SMTP server */
/* Do a EHLO command. If it fails, try the HELO command. */
- StrBufPrintf(Msg->IO.SendBuf.Buf,
- "EHLO %s\r\n", config.c_fqdn);
+ StrBufPrintf(Msg->IO.SendBuf.Buf, "EHLO %s\r\n", CtdlGetConfigStr("c_fqdn"));
SMTP_DBG_SEND();
return eReadMessage;
eNextState SMTPC_read_EHLO_reply(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
SMTP_DBG_READ();
if (SMTP_IS_STATE('2')) {
eNextState STMPC_send_HELO(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
- StrBufPrintf(Msg->IO.SendBuf.Buf,
- "HELO %s\r\n", config.c_fqdn);
+ StrBufPrintf(Msg->IO.SendBuf.Buf, "HELO %s\r\n", CtdlGetConfigStr("c_fqdn"));
SMTP_DBG_SEND();
return eReadMessage;
eNextState SMTPC_read_HELO_reply(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
SMTP_DBG_READ();
if (!SMTP_IS_STATE('2'))
eNextState SMTPC_send_auth(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
char buf[SIZ];
char encoded[1024];
eNextState SMTPC_read_auth_reply(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
/* Do an AUTH command if necessary */
SMTP_DBG_READ();
eNextState SMTPC_send_authplain_1(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
char buf[SIZ];
char encoded[1024];
long encodedlen;
}
eNextState SMTPC_read_auth_plain_reply_1(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
/* Do an AUTH command if necessary */
SMTP_DBG_READ();
eNextState SMTPC_send_authplain_2(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
char buf[SIZ];
char encoded[1024];
long encodedlen;
}
eNextState SMTPC_read_auth_plain_reply_2(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
/* Do an AUTH command if necessary */
SMTP_DBG_READ();
eNextState SMTPC_send_FROM(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
/* previous command succeeded, now try the MAIL FROM: command */
StrBufPrintf(Msg->IO.SendBuf.Buf,
"MAIL FROM:<%s>\r\n",
eNextState SMTPC_read_FROM_reply(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
SMTP_DBG_READ();
if (!SMTP_IS_STATE('2')) {
eNextState SMTPC_send_RCPT(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
/* MAIL succeeded, now try the RCPT To: command */
StrBufPrintf(Msg->IO.SendBuf.Buf,
"RCPT TO:<%s@%s>\r\n",
eNextState SMTPC_read_RCPT_reply(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
SMTP_DBG_READ();
if (!SMTP_IS_STATE('2')) {
eNextState SMTPC_send_DATAcmd(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
/* RCPT succeeded, now try the DATA command */
StrBufPlain(Msg->IO.SendBuf.Buf,
HKEY("DATA\r\n"));
eNextState SMTPC_send_QUIT(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
StrBufPlain(Msg->IO.SendBuf.Buf,
HKEY("QUIT\r\n"));
eNextState SMTPC_read_QUIT_reply(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
SMTP_DBG_READ();
- EVS_syslog(LOG_DEBUG,
+ syslog(LOG_DEBUG,
"delivery to <%s> @ <%s> (%s) succeeded\n",
Msg->user,
Msg->node,
int smtp_resolve_recipients(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
const char *ptr;
char buf[1024];
int scan_done;
int lp, rp;
int i;
- EVNCS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
if ((Msg==NULL) ||
(Msg->MyQEntry == NULL) ||
Msg->node,
Msg->name);
- EVNCS_syslog(LOG_DEBUG,
+ syslog(LOG_DEBUG,
"Attempting delivery to <%s> @ <%s> (%s)\n",
Msg->user,
Msg->node,