m_gmprot.c: Move interface to own file.

[nmh] / mts / smtp / smtp.c

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index 66549a5503630c4f00cc698f842c8c6335cf8ac4..8270b343a4796f7c8891a005a3e28269f50e0cfd 100644 (file)
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -5,14 +5,18 @@
  * complete copyright information.
  */
 
  * complete copyright information.
  */
 

-#include <h/mh.h>
+#include "h/mh.h"
+#include "sbr/r1bindex.h"
+#include "sbr/client.h"
+#include "sbr/error.h"

 #include "smtp.h"
 #include "smtp.h"

-#include <h/mts.h>
-#include <h/signals.h>
-#include <h/utils.h>
-#include <h/netsec.h>
+#include "h/mts.h"
+#include "h/signals.h"
+#include "h/utils.h"
+#include "h/netsec.h"

 
 #include <sys/socket.h>
 
 #include <sys/socket.h>

+#include "sbr/base64.h"

 
 /*
  * This module implements an interface to SendMail very similar
 
 /*
  * This module implements an interface to SendMail very similar


@@ -21,17 +25,6 @@
  * RP_-style codes.
  */
 
  * RP_-style codes.
  */
 

-#ifdef SENDMAILBUG
-/*
- * It appears that some versions of Sendmail will return Code 451
- * when they don't really want to indicate a failure.
- * "Code 451 almost always means sendmail has deferred; we don't
- * really want bomb out at this point since sendmail will rectify
- * things later."  So, if you define SENDMAILBUG, Code 451 is
- * considered the same as Code 250.  Yuck!
- */
-#endif
-

 #define        NBITS ((sizeof (int)) * 8)
 
 /* Timeout in seconds for SMTP commands.
 #define        NBITS ((sizeof (int)) * 8)
 
 /* Timeout in seconds for SMTP commands.


@@ -48,7 +41,7 @@
 static int sm_addrs = 0;
 static int sm_child = NOTOK;
 static int sm_debug = 0;
 static int sm_addrs = 0;
 static int sm_child = NOTOK;
 static int sm_debug = 0;

-static int sm_nl = TRUE;
+static bool sm_nl = true;

 static int sm_verbose = 0;
 static netsec_context *nsc = NULL;
 
 static int sm_verbose = 0;
 static netsec_context *nsc = NULL;
 


@@ -70,15 +63,15 @@ static int sendmail_init (char *, int, int, int, int, const char *,
                          const char *);
 
 static int rclient (char *, char *, char **);
                          const char *);
 
 static int rclient (char *, char *, char **);

-static int sm_ierror (const char *fmt, ...);
+static int sm_ierror (const char *fmt, ...) CHECK_PRINTF(1, 2);

 static int sm_nerror (char *);
 static int sm_nerror (char *);

-static int smtalk (int time, char *fmt, ...);
+static int smtalk (int time, char *fmt, ...) CHECK_PRINTF(2, 3);

 static int sm_wstream (char *, int);
 static int smhear (void);
 static int sm_wstream (char *, int);
 static int smhear (void);

-static char *EHLOset (char *);
+static char *EHLOset (char *) PURE;

 static int sm_sasl_callback(enum sasl_message_type, unsigned const char *,
                            unsigned int, unsigned char **, unsigned int *,
 static int sm_sasl_callback(enum sasl_message_type, unsigned const char *,
                            unsigned int, unsigned char **, unsigned int *,

-                           char **);
+                           void *, char **);

 
 int
 sm_init (char *client, char *server, char *port, int watch, int verbose,
 
 int
 sm_init (char *client, char *server, char *port, int watch, int verbose,


@@ -102,7 +95,7 @@ smtp_init (char *client, char *server, char *port, int watch, int verbose,
     char *errstr, *chosen_server;
 
     if (watch)
     char *errstr, *chosen_server;
 
     if (watch)

-       verbose = TRUE;
+       verbose = true;

 
     sm_verbose = verbose;
     sm_debug = debug;
 
     sm_verbose = verbose;
     sm_debug = debug;


@@ -143,7 +136,7 @@ smtp_init (char *client, char *server, char *port, int watch, int verbose,
 
     if (sasl) {
        if (netsec_set_sasl_params(nsc, "smtp", saslmech, sm_sasl_callback,
 
     if (sasl) {
        if (netsec_set_sasl_params(nsc, "smtp", saslmech, sm_sasl_callback,

-                                  &errstr) != OK)
+                                  NULL, &errstr) != OK)

            return sm_nerror(errstr);
     }
 
            return sm_nerror(errstr);
     }
 


@@ -273,7 +266,7 @@ sendmail_init (char *client, int watch, int verbose, int debug, int sasl,
     char *vec[15], *errstr;
 
     if (watch)
     char *vec[15], *errstr;
 
     if (watch)

-       verbose = TRUE;
+       verbose = true;

 
     sm_verbose = verbose;
     sm_debug = debug;
 
     sm_verbose = verbose;
     sm_debug = debug;


@@ -305,7 +298,7 @@ sendmail_init (char *client, int watch, int verbose, int debug, int sasl,
 
     if (sasl) {
        if (netsec_set_sasl_params(nsc, "smtp", saslmech, sm_sasl_callback,
 
     if (sasl) {
        if (netsec_set_sasl_params(nsc, "smtp", saslmech, sm_sasl_callback,

-                                  &errstr) != OK)
+                                  NULL, &errstr) != OK)

            return sm_nerror(errstr);
     }
 
            return sm_nerror(errstr);
     }
 


@@ -317,9 +310,7 @@ sendmail_init (char *client, int watch, int verbose, int debug, int sasl,
        return sm_ierror ("no pipes");
     }
 
        return sm_ierror ("no pipes");
     }
 

-    for (i = 0; (sm_child = fork ()) == NOTOK && i < 5; i++)
-       sleep (5);
-
+    sm_child = fork();

     switch (sm_child) {
        case NOTOK: 
            close (pdo[0]);
     switch (sm_child) {
        case NOTOK: 
            close (pdo[0]);


@@ -351,7 +342,7 @@ sendmail_init (char *client, int watch, int verbose, int debug, int sasl,
            execvp (sendmail, vec);
            fprintf (stderr, "unable to exec ");
            perror (sendmail);
            execvp (sendmail, vec);
            fprintf (stderr, "unable to exec ");
            perror (sendmail);

-           _exit (-1);         /* NOTREACHED */
+           _exit(1);           /* NOTREACHED */

 
        default: 
            SIGNAL (SIGPIPE, SIG_IGN);
 
        default: 
            SIGNAL (SIGPIPE, SIG_IGN);


@@ -359,7 +350,7 @@ sendmail_init (char *client, int watch, int verbose, int debug, int sasl,
            close (pdi[1]);
            close (pdo[0]);
 
            close (pdi[1]);
            close (pdo[0]);
 

-           netsec_set_fd(nsc, pdi[i], pdo[1]);
+           netsec_set_fd(nsc, pdi[0], pdo[1]);

            netsec_set_timeout(nsc, SM_OPEN);
            result = smhear ();
            switch (result) {
            netsec_set_timeout(nsc, SM_OPEN);
            result = smhear ();
            switch (result) {


@@ -493,10 +484,6 @@ sm_wadr (char *mbox, char *host, char *path)
            return RP_OK;
 
        case 451: 
            return RP_OK;
 
        case 451: 

-#ifdef SENDMAILBUG
-           sm_addrs++;
-           return RP_OK;
-#endif /* SENDMAILBUG */

        case 421: 
        case 450: 
        case 452: 
        case 421: 
        case 450: 
        case 452: 


@@ -523,14 +510,10 @@ sm_waend (void)
 {
     switch (smtalk (SM_DATA, "DATA")) {
        case 354: 
 {
     switch (smtalk (SM_DATA, "DATA")) {
        case 354: 

-           sm_nl = TRUE;
+           sm_nl = true;

            return RP_OK;
 
        case 451: 
            return RP_OK;
 
        case 451: 

-#ifdef SENDMAILBUG
-           sm_nl = TRUE;
-           return RP_OK;
-#endif /* SENDMAILBUG */

        case 421: 
            return RP_NO;
 
        case 421: 
            return RP_NO;
 


@@ -549,29 +532,51 @@ sm_waend (void)
 int
 sm_wtxt (char *buffer, int len)
 {
 int
 sm_wtxt (char *buffer, int len)
 {

-    int result;
+    int result, snoopstate;
+
+    if ((snoopstate = netsec_get_snoop(nsc)))
+       netsec_set_snoop(nsc, 0);

 
     result = sm_wstream (buffer, len);
 
 
     result = sm_wstream (buffer, len);
 

-    return (result == NOTOK ? RP_BHST : RP_OK);
+    netsec_set_snoop(nsc, snoopstate);
+    return result == NOTOK ? RP_BHST : RP_OK;

 }
 
 
 int
 sm_wtend (void)
 {
 }
 
 
 int
 sm_wtend (void)
 {

-    if (sm_wstream ((char *) NULL, 0) == NOTOK)
+    int snoopstate;
+
+    if ((snoopstate = netsec_get_snoop(nsc)))
+       netsec_set_snoop(nsc, 0);
+
+    if (sm_wstream(NULL, 0) == NOTOK)

        return RP_BHST;
 
        return RP_BHST;
 

+    /*
+     * Because snoop output now happens at flush time, if we are using snoop
+     * we force an extra flush here.  While this introduces some extra network
+     * traffic, we're only doing it when snoop is in effect so I think it's
+     * reasonable.
+     */
+
+    if (snoopstate) {
+       char *errstr;
+       if (netsec_flush(nsc, &errstr) != OK) {
+           sm_nerror(errstr);
+           return RP_BHST;
+       }
+       netsec_set_snoop(nsc, snoopstate);
+    }
+

     switch (smtalk (SM_DOT + 3 * sm_addrs, ".")) {
        case 250: 
        case 251: 
            return RP_OK;
 
        case 451: 
     switch (smtalk (SM_DOT + 3 * sm_addrs, ".")) {
        case 250: 
        case 251: 
            return RP_OK;
 
        case 451: 

-#ifdef SENDMAILBUG
-           return RP_OK;
-#endif /* SENDMAILBUG */

        case 452: 
        default: 
            return RP_NO;
        case 452: 
        default: 
            return RP_NO;


@@ -655,7 +660,7 @@ sm_end (int type)
        status = OK;
     }
 
        status = OK;
     }
 

-    return (status ? RP_BHST : RP_OK);
+    return status ? RP_BHST : RP_OK;

 }
 
 
 }
 
 


@@ -741,7 +746,7 @@ sm_wstream (char *buffer, int len)
     for (bp = buffer; bp && len > 0; bp++, len--) {
        switch (*bp) {
            case '\n': 
     for (bp = buffer; bp && len > 0; bp++, len--) {
        switch (*bp) {
            case '\n': 

-               sm_nl = TRUE;
+               sm_nl = true;

                if (netsec_write(nsc, "\r", 1, &errstr) != OK) {
                    sm_nerror(errstr);
                    return NOTOK;
                if (netsec_write(nsc, "\r", 1, &errstr) != OK) {
                    sm_nerror(errstr);
                    return NOTOK;


@@ -757,7 +762,7 @@ sm_wstream (char *buffer, int len)
                /* FALLTHRU */
 
            default: 
                /* FALLTHRU */
 
            default: 

-               sm_nl = FALSE;
+               sm_nl = false;

        }
        if (netsec_write(nsc, bp, 1, &errstr) != OK) {
            sm_nerror(errstr);
        }
        if (netsec_write(nsc, bp, 1, &errstr) != OK) {
            sm_nerror(errstr);


@@ -774,7 +779,8 @@ sm_wstream (char *buffer, int len)
 static int
 smhear (void)
 {
 static int
 smhear (void)
 {

-    int i, code, cont, more;
+    int i, code;
+    bool cont, more;

     size_t buflen, rc;
     unsigned char *bp;
     char *rp;
     size_t buflen, rc;
     unsigned char *bp;
     char *rp;


@@ -782,7 +788,7 @@ smhear (void)
     char **ehlo = EHLOkeys, *buffer;
 
     if (doingEHLO) {
     char **ehlo = EHLOkeys, *buffer;
 
     if (doingEHLO) {

-       static int at_least_once = 0;
+       static bool at_least_once;

 
        if (at_least_once) {
            char *ep;
 
        if (at_least_once) {
            char *ep;


@@ -792,7 +798,7 @@ smhear (void)
                free (ep);
            }
        } else {
                free (ep);
            }
        } else {

-           at_least_once = 1;
+           at_least_once = true;

        }
 
        ehlo = EHLOkeys;
        }
 
        ehlo = EHLOkeys;


@@ -806,7 +812,7 @@ again: ;
     rp = sm_reply.text;
     rc = sizeof(sm_reply.text) - 1;
 
     rp = sm_reply.text;
     rc = sizeof(sm_reply.text) - 1;
 

-    for (more = FALSE; (buffer = netsec_readline(nsc, &buflen,
+    for (more = false; (buffer = netsec_readline(nsc, &buflen,

                                                 &errstr)) != NULL ; ) {
 
        if (doingEHLO
                                                 &errstr)) != NULL ; ) {
 
        if (doingEHLO


@@ -832,13 +838,13 @@ again: ;
        for (; buflen > 0 && (!isascii (*bp) || !isdigit (*bp)); bp++, buflen--)
            continue;
 
        for (; buflen > 0 && (!isascii (*bp) || !isdigit (*bp)); bp++, buflen--)
            continue;
 

-       cont = FALSE;
+       cont = false;

        code = atoi ((char *) bp);
        bp += 3, buflen -= 3;
        for (; buflen > 0 && isspace (*bp); bp++, buflen--)
            continue;
        if (buflen > 0 && *bp == '-') {
        code = atoi ((char *) bp);
        bp += 3, buflen -= 3;
        for (; buflen > 0 && isspace (*bp); bp++, buflen--)
            continue;
        if (buflen > 0 && *bp == '-') {

-           cont = TRUE;
+           cont = true;

            bp++, buflen--;
            for (; buflen > 0 && isspace (*bp); bp++, buflen--)
                continue;
            bp++, buflen--;
            for (; buflen > 0 && isspace (*bp); bp++, buflen--)
                continue;


@@ -847,7 +853,7 @@ again: ;
        if (more) {
            if (code != sm_reply.code || cont)
                continue;
        if (more) {
            if (code != sm_reply.code || cont)
                continue;

-           more = FALSE;
+           more = false;

        } else {
            sm_reply.code = code;
            more = cont;
        } else {
            sm_reply.code = code;
            more = cont;


@@ -892,7 +898,8 @@ char *
 rp_string (int code)
 {
     char *text;
 rp_string (int code)
 {
     char *text;

-    static char buffer[BUFSIZ];
+    /* The additional space is to avoid warning from gcc -Wformat-truncation. */
+    static char buffer[BUFSIZ + 19];

 
     switch (sm_reply.code != NOTOK ? code : NOTOK) {
        case RP_AOK:
 
     switch (sm_reply.code != NOTOK ? code : NOTOK) {
        case RP_AOK:


@@ -956,7 +963,7 @@ EHLOset (char *s)
        }
     }
 
        }
     }
 

-    return 0;
+    return NULL;

 }
 
 /*
 }
 
 /*


@@ -968,11 +975,12 @@ EHLOset (char *s)
 static int
 sm_sasl_callback(enum sasl_message_type mtype, unsigned const char *indata,
                 unsigned int indatalen, unsigned char **outdata,
 static int
 sm_sasl_callback(enum sasl_message_type mtype, unsigned const char *indata,
                 unsigned int indatalen, unsigned char **outdata,

-                unsigned int *outdatalen, char **errstr)
+                unsigned int *outdatalen, void *context, char **errstr)

 {
     int rc, snoopoffset;
     char *mech, *line;
     size_t len;
 {
     int rc, snoopoffset;
     char *mech, *line;
     size_t len;

+    NMH_UNUSED(context);

 
     switch (mtype) {
     case NETSEC_SASL_START:
 
     switch (mtype) {
     case NETSEC_SASL_START:


@@ -995,15 +1003,19 @@ sm_sasl_callback(enum sasl_message_type mtype, unsigned const char *indata,
            snoopoffset = 6 + strlen(mech);
            rc = netsec_printf(nsc, errstr, "AUTH %s %s\r\n", mech, b64data);
            free(b64data);
            snoopoffset = 6 + strlen(mech);
            rc = netsec_printf(nsc, errstr, "AUTH %s %s\r\n", mech, b64data);
            free(b64data);

-           netsec_set_snoop_callback(nsc, NULL, NULL);

        } else {
            rc = netsec_printf(nsc, errstr, "AUTH %s\r\n", mech);
        }
 
        } else {
            rc = netsec_printf(nsc, errstr, "AUTH %s\r\n", mech);
        }
 

-       if (rc != OK)
+       if (rc != OK) {
+           netsec_set_snoop_callback(nsc, NULL, NULL);

            return NOTOK;
            return NOTOK;

+       }

 
 

-       if (netsec_flush(nsc, errstr) != OK)
+       rc = netsec_flush(nsc, errstr);
+       netsec_set_snoop_callback(nsc, NULL, NULL);
+
+       if (rc != OK)

            return NOTOK;
 
        break;
            return NOTOK;
 
        break;


@@ -1057,14 +1069,16 @@ sm_sasl_callback(enum sasl_message_type mtype, unsigned const char *indata,
            writeBase64raw(indata, indatalen, b64data);
            netsec_set_snoop_callback(nsc, netsec_b64_snoop_decoder, NULL);
            rc = netsec_printf(nsc, errstr, "%s\r\n", b64data);
            writeBase64raw(indata, indatalen, b64data);
            netsec_set_snoop_callback(nsc, netsec_b64_snoop_decoder, NULL);
            rc = netsec_printf(nsc, errstr, "%s\r\n", b64data);

-           netsec_set_snoop_callback(nsc, NULL, NULL);

            free(b64data);
        }
 
        if (rc != OK)
            return NOTOK;
 
            free(b64data);
        }
 
        if (rc != OK)
            return NOTOK;
 

-       if (netsec_flush(nsc, errstr) != OK)
+       rc = netsec_flush(nsc, errstr);
+       netsec_set_snoop_callback(nsc, NULL, NULL);
+
+       if (rc != OK)

            return NOTOK;
        break;
 
            return NOTOK;
        break;