Null-terminate buffer in mbx_copy() in dropsbr.c. Noticed by

[nmh] / mts / smtp / smtp.c

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index 05e292ff96ff5991c9213818ed803b8e18f9f766..7177e5d59ea330f086a2323f4576dcbb0042980f 100644 (file)
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -1,8 +1,6 @@
 /*
  * smtp.c -- nmh SMTP interface
  *
 /*
  * smtp.c -- nmh SMTP interface
  *

- * $Id$
- *

  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.


@@ -11,19 +9,29 @@
 #include <h/mh.h>
 #include "smtp.h"
 #include <h/mts.h>
 #include <h/mh.h>
 #include "smtp.h"
 #include <h/mts.h>

-#include <signal.h>

 #include <h/signals.h>
 
 #ifdef CYRUS_SASL
 #include <sasl/sasl.h>
 #include <sasl/saslutil.h>
 #include <h/signals.h>
 
 #ifdef CYRUS_SASL
 #include <sasl/sasl.h>
 #include <sasl/saslutil.h>

+# if SASL_VERSION_FULL < 0x020125
+    /* Cyrus SASL 2.1.25 introduced the sasl_callback_ft prototype,
+       which has an explicit void parameter list, according to best
+       practice.  So we need to cast to avoid compile warnings.
+       Provide this prototype for earlier versions. */
+    typedef int (*sasl_callback_ft)();
+# endif /* SASL_VERSION_FULL < 0x020125 */

 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>

-#include <errno.h>

 #endif /* CYRUS_SASL */
 
 #endif /* CYRUS_SASL */
 

+#ifdef TLS_SUPPORT
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#endif /* TLS_SUPPORT */
+

 /*
  * This module implements an interface to SendMail very similar
  * to the MMDF mm_(3) routines.  The sm_() routines herein talk
 /*
  * This module implements an interface to SendMail very similar
  * to the MMDF mm_(3) routines.  The sm_() routines herein talk


@@ -67,7 +75,9 @@
 #define        SM_DOT  600     /* see above */
 #define        SM_QUIT  30
 #define        SM_CLOS  10
 #define        SM_DOT  600     /* see above */
 #define        SM_QUIT  30
 #define        SM_CLOS  10

+#ifdef CYRUS_SASL

 #define        SM_AUTH  45
 #define        SM_AUTH  45

+#endif /* CYRUS_SASL */

 
 static int sm_addrs = 0;
 static int sm_alarmed = 0;
 
 static int sm_addrs = 0;
 static int sm_alarmed = 0;


@@ -87,32 +97,49 @@ static FILE *sm_wfp = NULL;
 static sasl_conn_t *conn = NULL;       /* SASL connection state */
 static int sasl_complete = 0;          /* Has authentication succeded? */
 static sasl_ssf_t sasl_ssf;            /* Our security strength factor */
 static sasl_conn_t *conn = NULL;       /* SASL connection state */
 static int sasl_complete = 0;          /* Has authentication succeded? */
 static sasl_ssf_t sasl_ssf;            /* Our security strength factor */

-static char *sasl_pw_context[2];       /* Context to pass into sm_get_pass */
+static char *sasl_pw_context[3];       /* Context to pass into sm_get_pass */

 static int maxoutbuf;                  /* Maximum crypto output buffer */
 static char *sasl_outbuffer;           /* SASL output buffer for encryption */
 static int sasl_outbuflen;             /* Current length of data in outbuf */
 static int maxoutbuf;                  /* Maximum crypto output buffer */
 static char *sasl_outbuffer;           /* SASL output buffer for encryption */
 static int sasl_outbuflen;             /* Current length of data in outbuf */

-static char *sasl_inbuffer;            /* SASL input buffer for encryption */
-static char *sasl_inptr;               /* Pointer to current inbuf position */
-static int sasl_inbuflen;              /* Current length of data in inbuf */

 static int sm_get_user(void *, int, const char **, unsigned *);
 static int sm_get_pass(sasl_conn_t *, void *, int, sasl_secret_t **);
 static int sm_get_user(void *, int, const char **, unsigned *);
 static int sm_get_pass(sasl_conn_t *, void *, int, sasl_secret_t **);

-static int sm_fgetc(FILE *);

 
 static sasl_callback_t callbacks[] = {
 
 static sasl_callback_t callbacks[] = {

-    { SASL_CB_USER, sm_get_user, NULL },
+    { SASL_CB_USER, (sasl_callback_ft) sm_get_user, NULL },

 #define SM_SASL_N_CB_USER 0
 #define SM_SASL_N_CB_USER 0

-    { SASL_CB_PASS, sm_get_pass, NULL },
-#define SM_SASL_N_CB_PASS 1
-    { SASL_CB_AUTHNAME, sm_get_user, NULL },
-#define SM_SASL_N_CB_AUTHNAME 2
+    { SASL_CB_AUTHNAME, (sasl_callback_ft) sm_get_user, NULL },
+#define SM_SASL_N_CB_AUTHNAME 1
+    { SASL_CB_PASS, (sasl_callback_ft) sm_get_pass, NULL },
+#define SM_SASL_N_CB_PASS 2

     { SASL_CB_LIST_END, NULL, NULL },
 };
 
     { SASL_CB_LIST_END, NULL, NULL },
 };
 

-#define SASL_MAXRECVBUF 65536

 #else /* CYRUS_SASL */
 #else /* CYRUS_SASL */

-#define sm_fgetc fgetc
+int sasl_ssf = 0;

 #endif /* CYRUS_SASL */
 
 #endif /* CYRUS_SASL */
 

+#ifdef TLS_SUPPORT
+static SSL_CTX *sslctx = NULL;
+static SSL *ssl = NULL;
+static BIO *sbior = NULL;
+static BIO *sbiow = NULL;
+static BIO *io = NULL;
+
+static int tls_negotiate(void);
+#endif /* TLS_SUPPORT */
+
+#if defined(CYRUS_SASL) || defined(TLS_SUPPORT)
+#define SASL_MAXRECVBUF 65536
+static int sm_fgetc(FILE *);
+static char *sasl_inbuffer;            /* SASL input buffer for encryption */
+static char *sasl_inptr;               /* Pointer to current inbuf position */
+static int sasl_inbuflen;              /* Current length of data in inbuf */
+#else
+#define sm_fgetc fgetc
+#endif
+
+static int tls_active = 0;
+

 static char *sm_noreply = "No reply text given";
 static char *sm_moreply = "; ";
 
 static char *sm_noreply = "No reply text given";
 static char *sm_moreply = "; ";
 


@@ -127,8 +154,9 @@ char *EHLOkeys[MAXEHLO + 1];
  * static prototypes
  */
 static int smtp_init (char *, char *, char *, int, int, int, int, int, int,
  * static prototypes
  */
 static int smtp_init (char *, char *, char *, int, int, int, int, int, int,

-                     char *, char *);
-static int sendmail_init (char *, char *, int, int, int, int, int);
+                     char *, char *, int);
+static int sendmail_init (char *, char *, int, int, int, int, int, int,
+                          char *, char *);

 
 static int rclient (char *, char *);
 static int sm_ierror (char *fmt, ...);
 
 static int rclient (char *, char *);
 static int sm_ierror (char *fmt, ...);


@@ -139,7 +167,7 @@ static int sm_werror (void);
 static int smhear (void);
 static int sm_rrecord (char *, int *);
 static int sm_rerror (int);
 static int smhear (void);
 static int sm_rrecord (char *, int *);
 static int sm_rerror (int);

-static RETSIGTYPE alrmser (int);
+static void alrmser (int);

 static char *EHLOset (char *);
 static int sm_fwrite(char *, int);
 static int sm_fputs(char *);
 static char *EHLOset (char *);
 static int sm_fwrite(char *, int);
 static int sm_fputs(char *);


@@ -152,31 +180,38 @@ static int sm_fgets(char *, int, FILE *);
  * Function prototypes needed for SASL
  */
 
  * Function prototypes needed for SASL
  */
 

-static int sm_auth_sasl(char *, char *, char *);
+static int sm_auth_sasl(char *, int, char *, char *);

 #endif /* CYRUS_SASL */
 
 int
 sm_init (char *client, char *server, char *port, int watch, int verbose,
 #endif /* CYRUS_SASL */
 
 int
 sm_init (char *client, char *server, char *port, int watch, int verbose,

-         int debug, int onex, int queued, int sasl, char *saslmech,
-         char *user)
+         int debug, int queued, int sasl, int saslssf,
+        char *saslmech, char *user, int tls)

 {
     if (sm_mts == MTS_SMTP)
        return smtp_init (client, server, port, watch, verbose,
 {
     if (sm_mts == MTS_SMTP)
        return smtp_init (client, server, port, watch, verbose,

-                         debug, onex, queued, sasl, saslmech, user);
+                         debug, queued, sasl, saslssf, saslmech,
+                         user, tls);

     else
        return sendmail_init (client, server, watch, verbose,
     else
        return sendmail_init (client, server, watch, verbose,

-                             debug, onex, queued);
+                              debug, queued, sasl, saslssf, saslmech,
+                             user);

 }
 
 static int
 smtp_init (char *client, char *server, char *port, int watch, int verbose,
 }
 
 static int
 smtp_init (char *client, char *server, char *port, int watch, int verbose,

-          int debug, int onex, int queued, int sasl, char *saslmech,
-          char *user)
+          int debug, int queued,
+           int sasl, int saslssf, char *saslmech, char *user, int tls)

 {
 {

+    int result, sd1, sd2;

 #ifdef CYRUS_SASL
     char *server_mechs;
 #ifdef CYRUS_SASL
     char *server_mechs;

+#else  /* CYRUS_SASL */
+    NMH_UNUSED (sasl);
+    NMH_UNUSED (saslssf);
+    NMH_UNUSED (saslmech);
+    NMH_UNUSED (user);

 #endif /* CYRUS_SASL */
 #endif /* CYRUS_SASL */

-    int result, sd1, sd2;

 
     if (watch)
        verbose = TRUE;
 
     if (watch)
        verbose = TRUE;


@@ -191,21 +226,23 @@ smtp_init (char *client, char *server, char *port, int watch, int verbose,
        if (clientname) {
            client = clientname;
        } else {
        if (clientname) {
            client = clientname;
        } else {

-           client = LocalName();       /* no clientname -> LocalName */
+           client = LocalName(1);      /* no clientname -> LocalName */

        }
     }
 
        }
     }
 

-#ifdef ZMAILER
+    /*
+     * Last-ditch check just in case client still isn't set to anything
+     */
+

     if (client == NULL || *client == '\0')
        client = "localhost";
     if (client == NULL || *client == '\0')
        client = "localhost";

-#endif

 
 

-#ifdef CYRUS_SASL
+#if defined(CYRUS_SASL) || defined(TLS_SUPPORT)

     sasl_inbuffer = malloc(SASL_MAXRECVBUF);
     if (!sasl_inbuffer)
        return sm_ierror("Unable to allocate %d bytes for read buffer",
                         SASL_MAXRECVBUF);
     sasl_inbuffer = malloc(SASL_MAXRECVBUF);
     if (!sasl_inbuffer)
        return sm_ierror("Unable to allocate %d bytes for read buffer",
                         SASL_MAXRECVBUF);

-#endif /* CYRUS_SASL */
+#endif /* CYRUS_SASL || TLS_SUPPORT */

 
     if ((sd1 = rclient (server, port)) == NOTOK)
        return RP_BHST;
 
     if ((sd1 = rclient (server, port)) == NOTOK)
        return RP_BHST;


@@ -226,6 +263,27 @@ smtp_init (char *client, char *server, char *port, int watch, int verbose,
        return sm_ierror ("unable to fdopen");
     }
 
        return sm_ierror ("unable to fdopen");
     }
 

+    tls_active = 0;
+
+#ifdef TLS_SUPPORT
+    /*
+     * If tls == 2, that means that the user requested "initial" TLS,
+     * which happens right after the connection has opened.  Do that
+     * negotiation now
+     */
+
+    if (tls == 2) {
+       result = tls_negotiate();
+
+       /*
+        * Note: if tls_negotiate() fails it will call sm_end() for us,
+        * which closes the connection.
+        */
+       if (result != RP_OK)
+           return result;
+    }
+#endif /* TLS_SUPPORT */
+

     sm_alarmed = 0;
     alarm (SM_OPEN);
     result = smhear ();
     sm_alarmed = 0;
     alarm (SM_OPEN);
     result = smhear ();


@@ -243,19 +301,61 @@ smtp_init (char *client, char *server, char *port, int watch, int verbose,
     /*
      * Give EHLO or HELO command
      */
     /*
      * Give EHLO or HELO command
      */

-    if (client && *client) {
+
+    doingEHLO = 1;
+    result = smtalk (SM_HELO, "EHLO %s", client);
+    doingEHLO = 0;
+
+    if (result >= 500 && result <= 599)
+       result = smtalk (SM_HELO, "HELO %s", client);
+
+    if (result != 250) {
+       sm_end (NOTOK);
+       return RP_RPLY;
+    }
+
+#ifdef TLS_SUPPORT
+    /*
+     * If the user requested TLS support, then try to do the STARTTLS command
+     * as part of the initial dialog.  Assuming this works, we then need to
+     * restart the EHLO dialog after TLS negotiation is complete.
+     */
+
+    if (tls == 1) {
+       if (! EHLOset("STARTTLS")) {
+           sm_end(NOTOK);
+           return sm_ierror("SMTP server does not support TLS");
+       }
+
+       result = smtalk(SM_HELO, "STARTTLS");
+
+       if (result != 220) {
+           sm_end(NOTOK);
+           return RP_RPLY;
+       }
+
+       /*
+        * Okay, the other side should be waiting for us to start TLS
+        * negotiation.  Oblige them.
+        */
+
+       result = tls_negotiate();
+
+       if (result != RP_OK)
+           return result;
+

        doingEHLO = 1;
        result = smtalk (SM_HELO, "EHLO %s", client);
        doingEHLO = 0;
 
        doingEHLO = 1;
        result = smtalk (SM_HELO, "EHLO %s", client);
        doingEHLO = 0;
 

-       if (result >= 500 && result <= 599)
-           result = smtalk (SM_HELO, "HELO %s", client);
-

        if (result != 250) {
            sm_end (NOTOK);
            return RP_RPLY;
        }
     }
        if (result != 250) {
            sm_end (NOTOK);
            return RP_RPLY;
        }
     }

+#else  /* TLS_SUPPORT */
+    NMH_UNUSED (tls);
+#endif /* TLS_SUPPORT */

 
 #ifdef CYRUS_SASL
     /*
 
 #ifdef CYRUS_SASL
     /*


@@ -278,7 +378,7 @@ smtp_init (char *client, char *server, char *port, int watch, int verbose,
                             saslmech, server_mechs);
        }
 
                             saslmech, server_mechs);
        }
 

-       if (sm_auth_sasl(user, saslmech ? saslmech : server_mechs,
+       if (sm_auth_sasl(user, saslssf, saslmech ? saslmech : server_mechs,

                         server) != RP_OK) {
            sm_end(NOTOK);
            return NOTOK;
                         server) != RP_OK) {
            sm_end(NOTOK);
            return NOTOK;


@@ -289,8 +389,6 @@ smtp_init (char *client, char *server, char *port, int watch, int verbose,
 send_options: ;
     if (watch && EHLOset ("XVRB"))
        smtalk (SM_HELO, "VERB on");
 send_options: ;
     if (watch && EHLOset ("XVRB"))
        smtalk (SM_HELO, "VERB on");

-    if (onex && EHLOset ("XONE"))
-       smtalk (SM_HELO, "ONEX");

     if (queued && EHLOset ("XQUE"))
        smtalk (SM_HELO, "QUED");
 
     if (queued && EHLOset ("XQUE"))
        smtalk (SM_HELO, "QUED");
 


@@ -299,11 +397,21 @@ send_options: ;
 
 int
 sendmail_init (char *client, char *server, int watch, int verbose,
 
 int
 sendmail_init (char *client, char *server, int watch, int verbose,

-               int debug, int onex, int queued)
+               int debug, int queued,
+               int sasl, int saslssf, char *saslmech, char *user)

 {
 {

-    int i, result, vecp;
+    unsigned int i, result, vecp;

     int pdi[2], pdo[2];
     char *vec[15];
     int pdi[2], pdo[2];
     char *vec[15];

+#ifdef CYRUS_SASL
+    char *server_mechs;
+#else  /* CYRUS_SASL */
+    NMH_UNUSED (server);
+    NMH_UNUSED (sasl);
+    NMH_UNUSED (saslssf);
+    NMH_UNUSED (saslmech);
+    NMH_UNUSED (user);
+#endif /* CYRUS_SASL */

 
     if (watch)
        verbose = TRUE;
 
     if (watch)
        verbose = TRUE;


@@ -317,20 +425,22 @@ sendmail_init (char *client, char *server, int watch, int verbose,
        if (clientname)
            client = clientname;
        else
        if (clientname)
            client = clientname;
        else

-           client = LocalName();       /* no clientname -> LocalName */
+           client = LocalName(1);      /* no clientname -> LocalName */

     }
 
     }
 

-#ifdef ZMAILER
+    /*
+     * Last-ditch check just in case client still isn't set to anything
+     */
+

     if (client == NULL || *client == '\0')
        client = "localhost";
     if (client == NULL || *client == '\0')
        client = "localhost";

-#endif

 
 

-#ifdef CYRUS_SASL
+#if defined(CYRUS_SASL) || defined(TLS_SUPPORT)

     sasl_inbuffer = malloc(SASL_MAXRECVBUF);
     if (!sasl_inbuffer)
        return sm_ierror("Unable to allocate %d bytes for read buffer",
                         SASL_MAXRECVBUF);
     sasl_inbuffer = malloc(SASL_MAXRECVBUF);
     if (!sasl_inbuffer)
        return sm_ierror("Unable to allocate %d bytes for read buffer",
                         SASL_MAXRECVBUF);

-#endif /* CYRUS_SASL */
+#endif /* CYRUS_SASL || TLS_SUPPORT */

 
     if (pipe (pdi) == NOTOK)
        return sm_ierror ("no pipes");
 
     if (pipe (pdi) == NOTOK)
        return sm_ierror ("no pipes");


@@ -364,15 +474,11 @@ sendmail_init (char *client, char *server, int watch, int verbose,
            vecp = 0;
            vec[vecp++] = r1bindex (sendmail, '/');
            vec[vecp++] = "-bs";
            vecp = 0;
            vec[vecp++] = r1bindex (sendmail, '/');
            vec[vecp++] = "-bs";

-#ifndef ZMAILER

            vec[vecp++] = watch ? "-odi" : queued ? "-odq" : "-odb";
            vec[vecp++] = "-oem";
            vec[vecp++] = "-om";
            vec[vecp++] = watch ? "-odi" : queued ? "-odq" : "-odb";
            vec[vecp++] = "-oem";
            vec[vecp++] = "-om";

-# ifndef RAND

            if (verbose)
                vec[vecp++] = "-ov";
            if (verbose)
                vec[vecp++] = "-ov";

-# endif /* not RAND */
-#endif /* not ZMAILER */

            vec[vecp++] = NULL;
 
            setgid (getegid ());
            vec[vecp++] = NULL;
 
            setgid (getegid ());


@@ -408,28 +514,51 @@ sendmail_init (char *client, char *server, int watch, int verbose,
                    return RP_RPLY;
            }
 
                    return RP_RPLY;
            }
 

-           if (client && *client) {
-               doingEHLO = 1;
-               result = smtalk (SM_HELO, "EHLO %s", client);
-               doingEHLO = 0;
+           doingEHLO = 1;
+           result = smtalk (SM_HELO, "EHLO %s", client);
+           doingEHLO = 0;

 
 

-               if (500 <= result && result <= 599)
-                   result = smtalk (SM_HELO, "HELO %s", client);
+           if (500 <= result && result <= 599)
+               result = smtalk (SM_HELO, "HELO %s", client);

 
 

-               switch (result) {
-                   case 250:
-                       break;
+           switch (result) {
+               case 250:
+                   break;

 
 

-                   default:
-                       sm_end (NOTOK);
-                       return RP_RPLY;
-               }
+               default:
+                   sm_end (NOTOK);
+                   return RP_RPLY;

            }
 
            }
 

-#ifndef ZMAILER
-           if (onex)
-               smtalk (SM_HELO, "ONEX");
-#endif
+#ifdef CYRUS_SASL
+    /*
+     * If the user asked for SASL, then check to see if the SMTP server
+     * supports it.  Otherwise, error out (because the SMTP server
+     * might have been spoofed; we don't want to just silently not
+     * do authentication
+     */
+
+    if (sasl) {
+       if (! (server_mechs = EHLOset("AUTH"))) {
+           sm_end(NOTOK);
+           return sm_ierror("SMTP server does not support SASL");
+       }
+
+       if (saslmech && stringdex(saslmech, server_mechs) == -1) {
+           sm_end(NOTOK);
+           return sm_ierror("Requested SASL mech \"%s\" is not in the "
+                            "list of supported mechanisms:\n%s",
+                            saslmech, server_mechs);
+       }
+
+       if (sm_auth_sasl(user, saslssf, saslmech ? saslmech : server_mechs,
+                        server) != RP_OK) {
+           sm_end(NOTOK);
+           return NOTOK;
+       }
+    }
+#endif /* CYRUS_SASL */
+

            if (watch)
                smtalk (SM_HELO, "VERB on");
 
            if (watch)
                smtalk (SM_HELO, "VERB on");
 


@@ -452,29 +581,9 @@ rclient (char *server, char *service)
 }
 
 int
 }
 
 int

-sm_winit (int mode, char *from)
+sm_winit (char *from)

 {
 {

-    char *smtpcom;
-
-    switch (mode) {
-       case S_MAIL:
-           smtpcom = "MAIL";
-           break;
-
-       case S_SEND:
-           smtpcom = "SEND";
-           break;
-
-       case S_SOML:
-           smtpcom = "SOML";
-           break;
-
-       case S_SAML:
-           smtpcom = "SAML";
-           break;
-    }
-
-    switch (smtalk (SM_MAIL, "%s FROM:<%s>", smtpcom, from)) {
+    switch (smtalk (SM_MAIL, "MAIL FROM:<%s>", from)) {

        case 250: 
            sm_addrs = 0;
            return RP_OK;
        case 250: 
            sm_addrs = 0;
            return RP_OK;


@@ -601,7 +710,7 @@ sm_end (int type)
     int status;
     struct smtp sm_note;
 
     int status;
     struct smtp sm_note;
 

-    if (sm_mts == MTS_SENDMAIL) {
+    if (sm_mts == MTS_SENDMAIL_SMTP) {

        switch (sm_child) {
            case NOTOK: 
            case OK: 
        switch (sm_child) {
            case NOTOK: 
            case OK: 


@@ -630,9 +739,19 @@ sm_end (int type)
            if (sm_mts == MTS_SMTP)
                smtalk (SM_QUIT, "QUIT");
            else {
            if (sm_mts == MTS_SMTP)
                smtalk (SM_QUIT, "QUIT");
            else {

+               /* The SIGPIPE block replaces old calls to discard ().
+                  We're not sure what the discard () calls were for,
+                  maybe to prevent deadlock on old systems.  In any
+                  case, blocking SIGPIPE should be harmless.
+                  Because the file handles are closed below, leave it
+                  blocked. */
+               sigset_t set, oset;
+               sigemptyset (&set);
+               sigaddset (&set, SIGPIPE);
+               sigprocmask (SIG_BLOCK, &set, &oset);
+

                kill (sm_child, SIGKILL);
                kill (sm_child, SIGKILL);

-               discard (sm_rfp);
-               discard (sm_wfp);
+               sm_child = NOTOK;

            }
            if (type == NOTOK) {
                sm_reply.code = sm_note.code;
            }
            if (type == NOTOK) {
                sm_reply.code = sm_note.code;


@@ -642,6 +761,13 @@ sm_end (int type)
            break;
     }
 
            break;
     }
 

+#ifdef TLS_SUPPORT
+    if (tls_active) {
+       BIO_ssl_shutdown(io);
+       BIO_free_all(io);
+    }
+#endif /* TLS_SUPPORT */
+

     if (sm_rfp != NULL) {
        alarm (SM_CLOS);
        fclose (sm_rfp);
     if (sm_rfp != NULL) {
        alarm (SM_CLOS);
        fclose (sm_rfp);


@@ -665,9 +791,11 @@ sm_end (int type)
        if (sasl_inbuffer)
            free(sasl_inbuffer);
 #endif /* CYRUS_SASL */
        if (sasl_inbuffer)
            free(sasl_inbuffer);
 #endif /* CYRUS_SASL */

-    } else {
+    } else if (sm_child != NOTOK) {

        status = pidwait (sm_child, OK);
        sm_child = NOTOK;
        status = pidwait (sm_child, OK);
        sm_child = NOTOK;

+    } else {
+       status = OK;

     }
 
     sm_rfp = sm_wfp = NULL;
     }
 
     sm_rfp = sm_wfp = NULL;


@@ -681,7 +809,7 @@ sm_end (int type)
  * (optionally) negotiated a security layer.
  */
 static int
  * (optionally) negotiated a security layer.
  */
 static int

-sm_auth_sasl(char *user, char *mechlist, char *inhost)
+sm_auth_sasl(char *user, int saslssf, char *mechlist, char *inhost)

 {
     int result, status;
     unsigned int buflen, outlen;
 {
     int result, status;
     unsigned int buflen, outlen;


@@ -690,17 +818,12 @@ sm_auth_sasl(char *user, char *mechlist, char *inhost)
     sasl_security_properties_t secprops;
     sasl_ssf_t *ssf;
     int *outbufmax;
     sasl_security_properties_t secprops;
     sasl_ssf_t *ssf;
     int *outbufmax;

+    struct nmh_creds creds = { 0, 0, 0 };

 
     /*
      * Initialize the callback contexts
      */
 
 
     /*
      * Initialize the callback contexts
      */
 

-    if (user == NULL)
-       user = getusername();
-
-    callbacks[SM_SASL_N_CB_USER].context = user;
-    callbacks[SM_SASL_N_CB_AUTHNAME].context = user;
-

     /*
      * This is a _bit_ of a hack ... but if the hostname wasn't supplied
      * to us on the command line, then call getpeername and do a
     /*
      * This is a _bit_ of a hack ... but if the hostname wasn't supplied
      * to us on the command line, then call getpeername and do a


@@ -731,8 +854,15 @@ sm_auth_sasl(char *user, char *mechlist, char *inhost)
        strncpy(host, inhost, sizeof(host) - 1);
     }
 
        strncpy(host, inhost, sizeof(host) - 1);
     }
 

+    nmh_get_credentials (host, user, 0, &creds);
+
+    /* It's OK to copy the creds pointers here.  The callbacks that
+       use them will only be called before this function returns. */
+    callbacks[SM_SASL_N_CB_USER].context = creds.user;
+    callbacks[SM_SASL_N_CB_AUTHNAME].context = creds.user;

     sasl_pw_context[0] = host;
     sasl_pw_context[0] = host;

-    sasl_pw_context[1] = user;
+    sasl_pw_context[1] = creds.user;
+    sasl_pw_context[2] = creds.password;

 
     callbacks[SM_SASL_N_CB_PASS].context = sasl_pw_context;
 
 
     callbacks[SM_SASL_N_CB_PASS].context = sasl_pw_context;
 


@@ -753,12 +883,14 @@ sm_auth_sasl(char *user, char *mechlist, char *inhost)
     }
 
     /*
     }
 
     /*

-     * Initialize the security properties
+     * Initialize the security properties.  But if TLS is active, then
+     * don't negotiate encryption here.

      */
 
     memset(&secprops, 0, sizeof(secprops));
     secprops.maxbufsize = SASL_MAXRECVBUF;
      */
 
     memset(&secprops, 0, sizeof(secprops));
     secprops.maxbufsize = SASL_MAXRECVBUF;

-    secprops.max_ssf = UINT_MAX;
+    secprops.max_ssf =
+      tls_active ? 0 : (saslssf != -1 ? (unsigned int) saslssf : UINT_MAX);

 
     result = sasl_setprop(conn, SASL_SEC_PROPS, &secprops);
 
 
     result = sasl_setprop(conn, SASL_SEC_PROPS, &secprops);
 


@@ -831,7 +963,6 @@ sm_auth_sasl(char *user, char *mechlist, char *inhost)
        } else {
            result = sasl_decode64(sm_reply.text, sm_reply.length,
                                   outbuf, sizeof(outbuf), &outlen);
        } else {
            result = sasl_decode64(sm_reply.text, sm_reply.length,
                                   outbuf, sizeof(outbuf), &outlen);

-       

            if (result != SASL_OK) {
                smtalk(SM_AUTH, "*");
                sm_ierror("SASL base64 decode failed: %s",
            if (result != SASL_OK) {
                smtalk(SM_AUTH, "*");
                sm_ierror("SASL base64 decode failed: %s",


@@ -940,26 +1071,21 @@ sm_get_pass(sasl_conn_t *conn, void *context, int id,
            sasl_secret_t **psecret)
 {
     char **pw_context = (char **) context;
            sasl_secret_t **psecret)
 {
     char **pw_context = (char **) context;

-    char *pass = NULL;

     int len;
 
     int len;
 

+    NMH_UNUSED (conn);
+

     if (! psecret || id != SASL_CB_PASS)
        return SASL_BADPARAM;
 
     if (! psecret || id != SASL_CB_PASS)
        return SASL_BADPARAM;
 

-    ruserpass(pw_context[0], &(pw_context[1]), &pass);
+    len = strlen (pw_context[2]);

 
 

-    len = strlen(pass);
-
-    *psecret = (sasl_secret_t *) malloc(sizeof(sasl_secret_t) + len);
-
-    if (! *psecret) {
-       free(pass);
+    if (! (*psecret = (sasl_secret_t *) malloc(sizeof(sasl_secret_t) + len))) {

        return SASL_NOMEM;
     }
 
     (*psecret)->len = len;
        return SASL_NOMEM;
     }
 
     (*psecret)->len = len;

-    strcpy((char *) (*psecret)->data, pass);
-/*    free(pass); */
+    strcpy((char *) (*psecret)->data, pw_context[2]);

 
     return SASL_OK;
 }
 
     return SASL_OK;
 }


@@ -992,10 +1118,10 @@ smtalk (int time, char *fmt, ...)
     va_end(ap);
 
     if (sm_debug) {
     va_end(ap);
 
     if (sm_debug) {

-#ifdef CYRUS_SASL

        if (sasl_ssf)
        if (sasl_ssf)

-               printf("(encrypted) ");
-#endif /* CYRUS_SASL */
+               printf("(sasl-encrypted) ");
+       if (tls_active)
+               printf("(tls-encrypted) ");

        printf ("=> %s\n", buffer);
        fflush (stdout);
     }
        printf ("=> %s\n", buffer);
        fflush (stdout);
     }


@@ -1078,11 +1204,24 @@ sm_fwrite(char *buffer, int len)
     const char *output;
     unsigned int outputlen;
 
     const char *output;
     unsigned int outputlen;
 

-    if (sasl_complete == 0 || sasl_ssf == 0)
+    if (sasl_complete == 0 || sasl_ssf == 0) {

 #endif /* CYRUS_SASL */
 #endif /* CYRUS_SASL */

+#ifdef TLS_SUPPORT
+       if (tls_active) {
+           int ret;
+
+           ret = BIO_write(io, buffer, len);
+
+           if (ret <= 0) {
+               sm_ierror("TLS error during write: %s",
+                         ERR_error_string(ERR_get_error(), NULL));
+               return NOTOK;
+           }
+       } else
+#endif /* TLS_SUPPORT */

        fwrite(buffer, sizeof(*buffer), len, sm_wfp);
 #ifdef CYRUS_SASL
        fwrite(buffer, sizeof(*buffer), len, sm_wfp);
 #ifdef CYRUS_SASL

-    else {
+    } else {

        while (len >= maxoutbuf - sasl_outbuflen) {
            memcpy(sasl_outbuffer + sasl_outbuflen, buffer,
                   maxoutbuf - sasl_outbuflen);
        while (len >= maxoutbuf - sasl_outbuflen) {
            memcpy(sasl_outbuffer + sasl_outbuflen, buffer,
                   maxoutbuf - sasl_outbuflen);


@@ -1108,6 +1247,102 @@ sm_fwrite(char *buffer, int len)
     return ferror(sm_wfp) ? NOTOK : RP_OK;
 }
 
     return ferror(sm_wfp) ? NOTOK : RP_OK;
 }
 

+#ifdef TLS_SUPPORT
+/*
+ * Negotiate Transport Layer Security
+ */
+
+static int
+tls_negotiate(void)
+{
+    BIO *ssl_bio;
+
+    if (! sslctx) {
+       const SSL_METHOD *method;
+
+       SSL_library_init();
+       SSL_load_error_strings();
+
+       method = TLSv1_client_method(); /* Not sure about this */
+
+       /* Older ssl takes a non-const arg. */
+       sslctx = SSL_CTX_new((SSL_METHOD *) method);
+
+       if (! sslctx) {
+           sm_end(NOTOK);
+           return sm_ierror("Unable to initialize OpenSSL context: %s",
+                            ERR_error_string(ERR_get_error(), NULL));
+       }
+    }
+
+    ssl = SSL_new(sslctx);
+
+    if (! ssl) {
+       sm_end(NOTOK);
+       return sm_ierror("Unable to create SSL connection: %s",
+                        ERR_error_string(ERR_get_error(), NULL));
+    }
+
+    sbior = BIO_new_socket(fileno(sm_rfp), BIO_NOCLOSE);
+    sbiow = BIO_new_socket(fileno(sm_wfp), BIO_NOCLOSE);
+
+    if (sbior == NULL || sbiow == NULL) {
+       sm_end(NOTOK);
+       return sm_ierror("Unable to create BIO endpoints: %s",
+                        ERR_error_string(ERR_get_error(), NULL));
+    }
+
+    SSL_set_bio(ssl, sbior, sbiow);
+    SSL_set_connect_state(ssl);
+
+    /*
+     * Set up a BIO to handle buffering for us
+     */
+
+    io = BIO_new(BIO_f_buffer());
+
+    if (! io) {
+       sm_end(NOTOK);
+       return sm_ierror("Unable to create a buffer BIO: %s",
+                        ERR_error_string(ERR_get_error(), NULL));
+    }
+
+    ssl_bio = BIO_new(BIO_f_ssl());
+
+    if (! ssl_bio) {
+       sm_end(NOTOK);
+       return sm_ierror("Unable to create a SSL BIO: %s",
+                        ERR_error_string(ERR_get_error(), NULL));
+    }
+
+    BIO_set_ssl(ssl_bio, ssl, BIO_CLOSE);
+    BIO_push(io, ssl_bio);
+
+    /*
+     * Try doing the handshake now
+     */
+
+    if (BIO_do_handshake(io) < 1) {
+       sm_end(NOTOK);
+       return sm_ierror("Unable to negotiate SSL connection: %s",
+                        ERR_error_string(ERR_get_error(), NULL));
+    }
+
+    if (sm_debug) {
+       const SSL_CIPHER *cipher = SSL_get_current_cipher(ssl);
+       printf("SSL negotiation successful: %s(%d) %s\n",
+              SSL_CIPHER_get_name(cipher),
+              SSL_CIPHER_get_bits(cipher, NULL),
+              SSL_CIPHER_get_version(cipher));
+
+    }
+
+    tls_active = 1;
+
+    return RP_OK;
+}
+#endif /* TLS_SUPPORT */
+

 /*
  * Convenience functions to replace occurences of fputs() and fputc()
  */
 /*
  * Convenience functions to replace occurences of fputs() and fputc()
  */


@@ -1152,6 +1387,12 @@ sm_fflush(void)
     }
 #endif /* CYRUS_SASL */
 
     }
 #endif /* CYRUS_SASL */
 

+#ifdef TLS_SUPPORT
+    if (tls_active) {
+       (void) BIO_flush(io);
+    }
+#endif /* TLS_SUPPORT */
+

     fflush(sm_wfp);
 }
 
     fflush(sm_wfp);
 }
 


@@ -1170,10 +1411,10 @@ sm_werror (void)
 static int
 smhear (void)
 {
 static int
 smhear (void)
 {

-    int i, code, cont, bc, rc, more;
+    int i, code, cont, bc = 0, rc, more;

     unsigned char *bp;
     char *rp;
     unsigned char *bp;
     char *rp;

-    char **ehlo, buffer[BUFSIZ];
+    char **ehlo = NULL, buffer[BUFSIZ];

 
     if (doingEHLO) {
        static int at_least_once = 0;
 
     if (doingEHLO) {
        static int at_least_once = 0;


@@ -1203,10 +1444,10 @@ again: ;
     for (more = FALSE; sm_rrecord ((char *) (bp = (unsigned char *) buffer),
                                   &bc) != NOTOK ; ) {
        if (sm_debug) {
     for (more = FALSE; sm_rrecord ((char *) (bp = (unsigned char *) buffer),
                                   &bc) != NOTOK ; ) {
        if (sm_debug) {

-#ifdef CYRUS_SASL

            if (sasl_ssf > 0)
            if (sasl_ssf > 0)

-               printf("(decrypted) ");
-#endif /* CYRUS_SASL */
+               printf("(sasl-decrypted) ");
+           if (tls_active)
+               printf("(tls-decrypted) ");

            printf ("<= %s\n", buffer);
            fflush (stdout);
        }
            printf ("<= %s\n", buffer);
            fflush (stdout);
        }


@@ -1299,7 +1540,7 @@ sm_rrecord (char *buffer, int *len)
     buffer[*len = 0] = 0;
 
     if ((retval = sm_fgets (buffer, BUFSIZ, sm_rfp)) != RP_OK)
     buffer[*len = 0] = 0;
 
     if ((retval = sm_fgets (buffer, BUFSIZ, sm_rfp)) != RP_OK)

-       return retval;
+       return sm_rerror (retval);

     *len = strlen (buffer);
     /* *len should be >0 except on EOF, but check for safety's sake */
     if (*len == 0)
     *len = strlen (buffer);
     /* *len should be >0 except on EOF, but check for safety's sake */
     if (*len == 0)


@@ -1344,9 +1585,9 @@ sm_fgets(char *buffer, int size, FILE *f)
 }
 
 
 }
 
 

-#ifdef CYRUS_SASL
+#if defined(CYRUS_SASL) || defined(TLS_SUPPORT)

 /*
 /*

- * Read from the network, but do SASL encryption
+ * Read from the network, but do SASL or TLS encryption

  */
 
 static int
  */
 
 static int


@@ -1371,6 +1612,28 @@ sm_fgetc(FILE *f)
 
     while (retbufsize == 0) {
 
 
     while (retbufsize == 0) {
 

+#ifdef TLS_SUPPORT
+       if (tls_active) {
+           cc = SSL_read(ssl, tmpbuf, sizeof(tmpbuf));
+
+           if (cc == 0) {
+               result = SSL_get_error(ssl, cc);
+
+               if (result != SSL_ERROR_ZERO_RETURN) {
+                   sm_ierror("TLS peer aborted connection");
+               }
+
+               return EOF;
+           }
+
+           if (cc < 0) {
+               sm_ierror("SSL_read failed: %s",
+                         ERR_error_string(ERR_get_error(), NULL));
+               return -2;
+           }
+       } else
+#endif /* TLS_SUPPORT */
+

        cc = read(fileno(f), tmpbuf, sizeof(tmpbuf));
 
        if (cc == 0)
        cc = read(fileno(f), tmpbuf, sizeof(tmpbuf));
 
        if (cc == 0)


@@ -1386,6 +1649,7 @@ sm_fgetc(FILE *f)
         * encryption working
         */
 
         * encryption working
         */
 

+#ifdef CYRUS_SASL

        if (sasl_complete == 0 || sasl_ssf == 0) {
            retbuf = tmpbuf;
            retbufsize = cc;
        if (sasl_complete == 0 || sasl_ssf == 0) {
            retbuf = tmpbuf;
            retbufsize = cc;


@@ -1399,6 +1663,10 @@ sm_fgetc(FILE *f)
                return -2;
            }
        }
                return -2;
            }
        }

+#else /* ! CYRUS_SASL */
+       retbuf = tmpbuf;
+       retbufsize = cc;
+#endif /* CYRUS_SASL */

     }
 
     if (retbufsize > SASL_MAXRECVBUF) {
     }
 
     if (retbufsize > SASL_MAXRECVBUF) {


@@ -1413,7 +1681,7 @@ sm_fgetc(FILE *f)
 
     return (int) sasl_inbuffer[0];
 }
 
     return (int) sasl_inbuffer[0];
 }

-#endif /* CYRUS_SASL */
+#endif /* CYRUS_SASL || TLS_SUPPORT */

 
 static int
 sm_rerror (int rc)
 
 static int
 sm_rerror (int rc)


@@ -1435,9 +1703,11 @@ sm_rerror (int rc)
 }
 
 
 }
 
 

-static RETSIGTYPE
+static void

 alrmser (int i)
 {
 alrmser (int i)
 {

+    NMH_UNUSED (i);
+

 #ifndef        RELIABLE_SIGNALS
     SIGNAL (SIGALRM, alrmser);
 #endif
 #ifndef        RELIABLE_SIGNALS
     SIGNAL (SIGALRM, alrmser);
 #endif