fixed off-by-one error in previous commit

[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 198649e1f2c00522b2f738b7ee04cbf15e1840ef..f40c59fef71f58ff64c5e672871f36a02f16f780 100644 (file)
--- a/citadel/modules/smtp/smtp_clienthandlers.c
+++ b/citadel/modules/smtp/smtp_clienthandlers.c
@@ -17,21 +17,15 @@
  * 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"
@@ -108,10 +102,10 @@
 #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.
@@ -140,12 +134,10 @@ eNextState SMTPC_read_greeting(SmtpOutMsg *Msg)
 
 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;
@@ -153,7 +145,6 @@ eNextState SMTPC_send_EHLO(SmtpOutMsg *Msg)
 
 eNextState SMTPC_read_EHLO_reply(SmtpOutMsg *Msg)
 {
-       AsyncIO *IO = &Msg->IO;
        SMTP_DBG_READ();
 
        if (SMTP_IS_STATE('2')) {
@@ -179,9 +170,7 @@ eNextState SMTPC_read_EHLO_reply(SmtpOutMsg *Msg)
 
 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;
@@ -189,7 +178,6 @@ eNextState STMPC_send_HELO(SmtpOutMsg *Msg)
 
 eNextState SMTPC_read_HELO_reply(SmtpOutMsg *Msg)
 {
-       AsyncIO *IO = &Msg->IO;
        SMTP_DBG_READ();
 
        if (!SMTP_IS_STATE('2'))
@@ -213,7 +201,6 @@ eNextState SMTPC_read_HELO_reply(SmtpOutMsg *Msg)
 
 eNextState SMTPC_send_auth(SmtpOutMsg *Msg)
 {
-       AsyncIO *IO = &Msg->IO;
        char buf[SIZ];
        char encoded[1024];
 
@@ -254,7 +241,6 @@ eNextState SMTPC_send_auth(SmtpOutMsg *Msg)
 
 eNextState SMTPC_read_auth_reply(SmtpOutMsg *Msg)
 {
-       AsyncIO *IO = &Msg->IO;
        /* Do an AUTH command if necessary */
 
        SMTP_DBG_READ();
@@ -280,7 +266,6 @@ eNextState SMTPC_read_auth_reply(SmtpOutMsg *Msg)
 
 eNextState SMTPC_send_authplain_1(SmtpOutMsg *Msg)
 {
-       AsyncIO *IO = &Msg->IO;
        char buf[SIZ];
        char encoded[1024];
        long encodedlen;
@@ -311,7 +296,6 @@ eNextState SMTPC_send_authplain_1(SmtpOutMsg *Msg)
 }
 eNextState SMTPC_read_auth_plain_reply_1(SmtpOutMsg *Msg)
 {
-       AsyncIO *IO = &Msg->IO;
        /* Do an AUTH command if necessary */
 
        SMTP_DBG_READ();
@@ -324,7 +308,6 @@ eNextState SMTPC_read_auth_plain_reply_1(SmtpOutMsg *Msg)
 
 eNextState SMTPC_send_authplain_2(SmtpOutMsg *Msg)
 {
-       AsyncIO *IO = &Msg->IO;
        char buf[SIZ];
        char encoded[1024];
        long encodedlen;
@@ -356,7 +339,6 @@ eNextState SMTPC_send_authplain_2(SmtpOutMsg *Msg)
 }
 eNextState SMTPC_read_auth_plain_reply_2(SmtpOutMsg *Msg)
 {
-       AsyncIO *IO = &Msg->IO;
        /* Do an AUTH command if necessary */
 
        SMTP_DBG_READ();
@@ -372,7 +354,6 @@ eNextState SMTPC_read_auth_plain_reply_2(SmtpOutMsg *Msg)
 
 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",
@@ -384,7 +365,6 @@ eNextState SMTPC_send_FROM(SmtpOutMsg *Msg)
 
 eNextState SMTPC_read_FROM_reply(SmtpOutMsg *Msg)
 {
-       AsyncIO *IO = &Msg->IO;
        SMTP_DBG_READ();
 
        if (!SMTP_IS_STATE('2')) {
@@ -399,7 +379,6 @@ eNextState SMTPC_read_FROM_reply(SmtpOutMsg *Msg)
 
 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",
@@ -412,7 +391,6 @@ eNextState SMTPC_send_RCPT(SmtpOutMsg *Msg)
 
 eNextState SMTPC_read_RCPT_reply(SmtpOutMsg *Msg)
 {
-       AsyncIO *IO = &Msg->IO;
        SMTP_DBG_READ();
 
        if (!SMTP_IS_STATE('2')) {
@@ -426,7 +404,6 @@ eNextState SMTPC_read_RCPT_reply(SmtpOutMsg *Msg)
 
 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"));
@@ -507,7 +484,6 @@ eNextState SMTPC_read_data_body_reply(SmtpOutMsg *Msg)
 
 eNextState SMTPC_send_QUIT(SmtpOutMsg *Msg)
 {
-       AsyncIO *IO = &Msg->IO;
        StrBufPlain(Msg->IO.SendBuf.Buf,
                    HKEY("QUIT\r\n"));
 
@@ -517,10 +493,9 @@ eNextState SMTPC_send_QUIT(SmtpOutMsg *Msg)
 
 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,
@@ -624,14 +599,13 @@ const ConstStr ReadErrors[eMaxSMTPC + 1] = {
 
 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) ||
@@ -645,7 +619,7 @@ int smtp_resolve_recipients(SmtpOutMsg *Msg)
                            Msg->node,
                            Msg->name);
 
-       EVNCS_syslog(LOG_DEBUG,
+       syslog(LOG_DEBUG,
                     "Attempting delivery to <%s> @ <%s> (%s)\n",
                     Msg->user,
                     Msg->node,