Specify yyyy-mm-dd date format for a man page's .TH date.

[nmh] / uip / post.c

diff --git a/uip/post.c b/uip/post.c
index e78677f831106cd195edb6967e0d82019c9aac8b..9973beb793fa5dadba6322d9a804d9e7f28eb385 100644 (file)
--- a/uip/post.c
+++ b/uip/post.c
@@ -1,4 +1,3 @@
-

 /*
  * post.c -- enter messages into the mail transport system
  *
 /*
  * post.c -- enter messages into the mail transport system
  *


@@ -40,7 +39,7 @@
 #ifndef OAUTH_SUPPORT
 # define OAUTHminc(a)  (a)
 #else /* OAUTH_SUPPORT */
 #ifndef OAUTH_SUPPORT
 # define OAUTHminc(a)  (a)
 #else /* OAUTH_SUPPORT */

-# define OAUTHmine(a)  0
+# define OAUTHminc(a)  0

 #endif /* OAUTH_SUPPORT */
 
 #define FCCS           10      /* max number of fccs allowed */
 #endif /* OAUTH_SUPPORT */
 
 #define FCCS           10      /* max number of fccs allowed */


@@ -82,28 +81,30 @@
     X("server host", 6, SERVSW) /* specify alternate SMTP server */ \
     X("snoop", -5, SNOOPSW) /* snoop the SMTP transaction */ \
     X("partno", -6, PARTSW) \
     X("server host", 6, SERVSW) /* specify alternate SMTP server */ \
     X("snoop", -5, SNOOPSW) /* snoop the SMTP transaction */ \
     X("partno", -6, PARTSW) \

-    X("sasl", SASLminc(-4), SASLSW) \
-    X("nosasl", SASLminc(-6), NOSASLSW) \
-    X("saslmaxssf", SASLminc(-10), SASLMXSSFSW) \
-    X("saslmech", SASLminc(-5), SASLMECHSW) \
+    X("sasl", SASLminc(4), SASLSW) \
+    X("nosasl", SASLminc(6), NOSASLSW) \
+    X("saslmech", SASLminc(5), SASLMECHSW) \

     X("user", SASLminc(-4), USERSW) \
     X("port server submission port name/number", 4, PORTSW) \
     X("tls", TLSminc(-3), TLSSW) \
     X("initialtls", TLSminc(-10), INITTLSSW) \
     X("notls", TLSminc(-5), NTLSSW) \
     X("user", SASLminc(-4), USERSW) \
     X("port server submission port name/number", 4, PORTSW) \
     X("tls", TLSminc(-3), TLSSW) \
     X("initialtls", TLSminc(-10), INITTLSSW) \
     X("notls", TLSminc(-5), NTLSSW) \

+    X("certverify", TLSminc(-10), CERTVERSW) \
+    X("nocertverify", TLSminc(-12), NOCERTVERSW) \

     X("fileproc", -4, FILEPROCSW) \
     X("mhlproc", -3, MHLPROCSW) \
     X("sendmail program", 0, MTSSM) \
     X("mts smtp|sendmail/smtp|sendmail/pipe", 2, MTSSW) \
     X("credentials legacy|file:filename", 0, CREDENTIALSSW) \
     X("messageid localname|random", 2, MESSAGEIDSW) \
     X("fileproc", -4, FILEPROCSW) \
     X("mhlproc", -3, MHLPROCSW) \
     X("sendmail program", 0, MTSSM) \
     X("mts smtp|sendmail/smtp|sendmail/pipe", 2, MTSSW) \
     X("credentials legacy|file:filename", 0, CREDENTIALSSW) \
     X("messageid localname|random", 2, MESSAGEIDSW) \

-    X("oauthcredfile", OAUTHminc(-7), OAUTHCREDFILESW) \
-    X("oauthclientid", OAUTHminc(-12), OAUTHCLIDSW) \
-    X("oauthclientsecret", OAUTHminc(-12), OAUTHCLSECSW) \
-    X("oauthauthendpoint", OAUTHminc(-6), OAUTHAUTHENDSW) \
-    X("oauthredirect", OAUTHminc(-6), OAUTHREDIRSW) \
-    X("oauthtokenendpoint", OAUTHminc(-6), OAUTHTOKENDSW) \
-    X("oauthscope", OAUTHminc(-6), OAUTHSCOPESW) \
+    X("authservice auth-service-name", OAUTHminc(-11), AUTHSERVICESW) \
+    X("oauthcredfile credential-file", OAUTHminc(-7), OAUTHCREDFILESW) \
+    X("oauthclientid client-id", OAUTHminc(-12), OAUTHCLIDSW) \
+    X("oauthclientsecret client-secret", OAUTHminc(-12), OAUTHCLSECSW) \
+    X("oauthauthendpoint authentication-endpoint", OAUTHminc(-6), OAUTHAUTHENDSW) \
+    X("oauthredirect redirect-uri", OAUTHminc(-6), OAUTHREDIRSW) \
+    X("oauthtokenendpoint token-endpoint", OAUTHminc(-6), OAUTHTOKENDSW) \
+    X("oauthscope scope", OAUTHminc(-6), OAUTHSCOPESW) \

 
 #define X(sw, minchars, id) id,
 DEFINE_SWITCH_ENUM(POST);
 
 #define X(sw, minchars, id) id,
 DEFINE_SWITCH_ENUM(POST);


@@ -114,6 +115,26 @@ DEFINE_SWITCH_ARRAY(POST, switches);
 #undef X
 
 
 #undef X
 
 

+/*
+ * Mapping between command-line switches and profile entries, communicated
+ * from 'send'.  We use a service name of 'post' internally.
+ */
+
+static struct oauth_profile {
+    const char *profname;
+    int switchnum;
+    const char *value;
+} oauthswitches[] = {
+    { "oauth-%s-credential-file", OAUTHCREDFILESW, NULL },
+    { "oauth-%s-client_id", OAUTHCLIDSW, NULL },
+    { "oauth-%s-client_secret", OAUTHCLSECSW, NULL },
+    { "oauth-%s-auth_endpoint", OAUTHAUTHENDSW, NULL },
+    { "oauth-%s-redirect_uri", OAUTHREDIRSW, NULL },
+    { "oauth-%s-token_endpoint", OAUTHTOKENDSW, NULL },
+    { "oauth-%s-scope", OAUTHSCOPESW, NULL },
+    { NULL, 0, NULL }
+};
+

 struct headers {
     char *value;
     unsigned int flags;
 struct headers {
     char *value;
     unsigned int flags;


@@ -137,6 +158,8 @@ struct headers {
 #define        HDCC  0x0400    /* another undocumented feature                       */
 #define HONE  0x0800   /* Only (zero or) one address allowed                 */
 #define HEFM  0x1000   /* Envelope-From: header                              */
 #define        HDCC  0x0400    /* another undocumented feature                       */
 #define HONE  0x0800   /* Only (zero or) one address allowed                 */
 #define HEFM  0x1000   /* Envelope-From: header                              */

+#define HMIM  0x2000    /* MIME-Version: header                               */
+#define HCTE  0x4000    /* Content-Transfer-Encoding: header                  */

 
 /*
  * flags for headers->set
 
 /*
  * flags for headers->set


@@ -149,7 +172,7 @@ struct headers {
 #define MSND  0x0020   /* we've seen a Sender:      */
 #define MRSN  0x0040   /* We've seen a Resent-Sendr:*/
 #define MEFM  0x0080   /* We've seen Envelope-From: */
 #define MSND  0x0020   /* we've seen a Sender:      */
 #define MRSN  0x0040   /* We've seen a Resent-Sendr:*/
 #define MEFM  0x0080   /* We've seen Envelope-From: */

-
+#define MMIM  0x0100    /* We've seen Mime-Version:  */

 
 static struct headers NHeaders[] = {
     { "Return-Path",   HBAD,                0 },
 
 static struct headers NHeaders[] = {
     { "Return-Path",   HBAD,                0 },


@@ -166,6 +189,8 @@ static struct headers NHeaders[] = {
     { "Message-ID",    HBAD,                0 },
     { "Fcc",           HFCC,                0 },
     { "Envelope-From", HADR|HONE|HEFM,      MEFM },
     { "Message-ID",    HBAD,                0 },
     { "Fcc",           HFCC,                0 },
     { "Envelope-From", HADR|HONE|HEFM,      MEFM },

+    { "MIME-Version",  HMIM,                MMIM },
+    { "Content-Transfer-Encoding",  HCTE,   0 },

     { NULL,            0,                   0 }
 };
 
     { NULL,            0,                   0 }
 };
 


@@ -189,6 +214,8 @@ static struct headers RHeaders[] = {
     { "Bcc",               HADR|HTRY|HBCC|HNIL, 0 },
     { "Fcc",               HIGN,                0 },
     { "Envelope-From",     HADR|HONE|HEFM,      MEFM },
     { "Bcc",               HADR|HTRY|HBCC|HNIL, 0 },
     { "Fcc",               HIGN,                0 },
     { "Envelope-From",     HADR|HONE|HEFM,      MEFM },

+    { "MIME-Version",      HMIM,                MMIM },
+    { "Content-Transfer-Encoding",  HCTE,       0 },

     { NULL,                0,                   0 }
 };
 
     { NULL,                0,                   0 }
 };
 


@@ -211,11 +238,10 @@ static int checksw = 0;           /* whom -check                           */
 static int linepos=0;          /* putadr()'s position on the line       */
 static int nameoutput=0;       /* putadr() has output header name       */
 static int sasl=0;             /* Use SASL auth for SMTP                */
 static int linepos=0;          /* putadr()'s position on the line       */
 static int nameoutput=0;       /* putadr() has output header name       */
 static int sasl=0;             /* Use SASL auth for SMTP                */

-static int saslssf=-1;         /* Our maximum SSF for SASL              */

 static char *saslmech=NULL;    /* Force use of particular SASL mech     */
 static char *user=NULL;                /* Authenticate as this user             */
 static char *port="submission";        /* Name of server port for SMTP submission */
 static char *saslmech=NULL;    /* Force use of particular SASL mech     */
 static char *user=NULL;                /* Authenticate as this user             */
 static char *port="submission";        /* Name of server port for SMTP submission */

-static int tls=-1;             /* Use TLS for encryption                */
+static int tlsflag=0;          /* Flags to control TLS settings         */

 static int fromcount=0;                /* Count of addresses on From: header    */
 static int seensender=0;       /* Have we seen a Sender: header?        */
 
 static int fromcount=0;                /* Count of addresses on From: header    */
 static int seensender=0;       /* Have we seen a Sender: header?        */
 


@@ -239,6 +265,8 @@ static char fullfrom[BUFSIZ];       /* full contents of From header  */
 static char *filter = NULL;    /* the filter for BCC'ing        */
 static char *subject = NULL;   /* the subject field for BCC'ing */
 static char *fccfold[FCCS];    /* foldernames for FCC'ing       */
 static char *filter = NULL;    /* the filter for BCC'ing        */
 static char *subject = NULL;   /* the subject field for BCC'ing */
 static char *fccfold[FCCS];    /* foldernames for FCC'ing       */

+enum encoding { UNKNOWN = 0, BINARY = 1, SEVENBIT = 7, EIGHTBIT = 8 };
+static enum encoding cte = UNKNOWN;

 
 static struct headers  *hdrtab;        /* table for the message we're doing */
 
 
 static struct headers  *hdrtab;        /* table for the message we're doing */
 


@@ -258,7 +286,7 @@ static char *partno = NULL;
 /*
  * static prototypes
  */
 /*
  * static prototypes
  */

-static void putfmt (char *, char *, FILE *);
+static void putfmt (char *, char *, int *, FILE *);

 static void start_headers (void);
 static void finish_headers (FILE *);
 static int get_header (char *, struct headers *);
 static void start_headers (void);
 static void finish_headers (FILE *);
 static int get_header (char *, struct headers *);


@@ -270,14 +298,14 @@ static void anno (void);
 static int annoaux (struct mailname *);
 static void insert_fcc (struct headers *, char *);
 static void make_bcc_file (int);
 static int annoaux (struct mailname *);
 static void insert_fcc (struct headers *, char *);
 static void make_bcc_file (int);

-static void verify_all_addresses (int, char *);
+static void verify_all_addresses (int, int, char *, int, char *);

 static void chkadr (void);
 static void sigon (void);
 static void sigoff (void);
 static void p_refile (char *);
 static void fcc (char *, char *);
 static void die (char *, char *, ...);
 static void chkadr (void);
 static void sigon (void);
 static void sigoff (void);
 static void p_refile (char *);
 static void fcc (char *, char *);
 static void die (char *, char *, ...);

-static void post (char *, int, int, char *);
+static void post (char *, int, int, int, char *, int, char *);

 static void do_text (char *file, int fd);
 static void do_an_address (struct mailname *, int);
 static void do_addresses (int, int);
 static void do_text (char *file, int fd);
 static void do_an_address (struct mailname *, int);
 static void do_addresses (int, int);


@@ -287,21 +315,23 @@ static int find_prefix (void);
 int
 main (int argc, char **argv)
 {
 int
 main (int argc, char **argv)
 {

-    int state, compnum, dashstuff = 0;
+    int state, compnum, dashstuff = 0, swnum, oauth_flag = 0, tls = -1;
+    int noverify = 0;
+    int eai = 0; /* use Email Address Internationalization (EAI) (SMTPUTF8) */

     char *cp, *msg = NULL, **argp, **arguments, *envelope;
     char *cp, *msg = NULL, **argp, **arguments, *envelope;

-    char buf[BUFSIZ], name[NAMESZ];
+    char buf[BUFSIZ], name[NAMESZ], *auth_svc = NULL;

     FILE *in, *out;
     m_getfld_state_t gstate = 0;
 
     if (nmh_init(argv[0], 0 /* use context_foil() */)) { return 1; }
 
     FILE *in, *out;
     m_getfld_state_t gstate = 0;
 
     if (nmh_init(argv[0], 0 /* use context_foil() */)) { return 1; }
 

-    mts_init (invo_name);
+    mts_init ();

     arguments = getarguments (invo_name, argc, argv, 0);
     argp = arguments;
 
     while ((cp = *argp++)) {
        if (*cp == '-') {
     arguments = getarguments (invo_name, argc, argv, 0);
     argp = arguments;
 
     while ((cp = *argp++)) {
        if (*cp == '-') {

-           switch (smatch (++cp, switches)) {
+           switch ((swnum = smatch (++cp, switches))) {

                case AMBIGSW: 
                    ambigsw (cp, switches);
                    done (1);
                case AMBIGSW: 
                    ambigsw (cp, switches);
                    done (1);


@@ -442,17 +472,45 @@ main (int argc, char **argv)
                    sasl = 0;
                    continue;
 
                    sasl = 0;
                    continue;
 

-               case SASLMXSSFSW:
-                   if (!(cp = *argp++) || *cp == '-')
-                       adios (NULL, "missing argument to %s", argp[-2]);
-                   saslssf = atoi(cp);
-                   continue;
-               

                case SASLMECHSW:
                    if (!(saslmech = *argp++) || *saslmech == '-')
                        adios (NULL, "missing argument to %s", argp[-2]);
                    continue;
                case SASLMECHSW:
                    if (!(saslmech = *argp++) || *saslmech == '-')
                        adios (NULL, "missing argument to %s", argp[-2]);
                    continue;

-               
+
+               case AUTHSERVICESW:
+                   if (!(auth_svc = *argp++) || *auth_svc == '-')
+                       adios (NULL, "missing argument to %s", argp[-2]);
+                   oauth_flag++;
+                   continue;
+
+               case OAUTHCREDFILESW:
+               case OAUTHCLIDSW:
+               case OAUTHCLSECSW:
+               case OAUTHAUTHENDSW:
+               case OAUTHREDIRSW:
+               case OAUTHTOKENDSW:
+               case OAUTHSCOPESW:
+               {
+                   int i;
+
+                   if (!(cp = *argp++) || *cp == '-')
+                       adios (NULL, "missing argument to %s", argp[-2]);
+
+                   for (i = 0; oauthswitches[i].profname != NULL; i++) {
+                       if (oauthswitches[i].switchnum == swnum) {
+                           oauthswitches[i].value = cp;
+                           break;
+                       }
+                   }
+
+                   if (oauthswitches[i].profname == NULL)
+                       adios (NULL, "internal error: cannot map switch %s "
+                              "to profile entry", argp[-2]);
+
+                   oauth_flag++;
+                   continue;
+               }
+

                case USERSW:
                    if (!(user = *argp++) || *user == '-')
                        adios (NULL, "missing argument to %s", argp[-2]);
                case USERSW:
                    if (!(user = *argp++) || *user == '-')
                        adios (NULL, "missing argument to %s", argp[-2]);


@@ -475,6 +533,14 @@ main (int argc, char **argv)
                    tls = 0;
                    continue;
 
                    tls = 0;
                    continue;
 

+               case CERTVERSW:
+                   noverify = 0;
+                   continue;
+
+               case NOCERTVERSW:
+                   noverify++;
+                   continue;
+

                case FILEPROCSW:
                    if (!(cp = *argp++) || *cp == '-')
                        adios (NULL, "missing argument to %s", argp[-2]);
                case FILEPROCSW:
                    if (!(cp = *argp++) || *cp == '-')
                        adios (NULL, "missing argument to %s", argp[-2]);


@@ -556,14 +622,14 @@ main (int argc, char **argv)
        switch (state = m_getfld (&gstate, name, buf, &bufsz, in)) {
            case FLD: 
            case FLDPLUS: 
        switch (state = m_getfld (&gstate, name, buf, &bufsz, in)) {
            case FLD: 
            case FLDPLUS: 

-               compnum++;
-               cp = add (buf, NULL);
+                compnum++;
+               cp = mh_xstrdup(buf);

                while (state == FLDPLUS) {
                    bufsz = sizeof buf;
                    state = m_getfld (&gstate, name, buf, &bufsz, in);
                    cp = add (buf, cp);
                }
                while (state == FLDPLUS) {
                    bufsz = sizeof buf;
                    state = m_getfld (&gstate, name, buf, &bufsz, in);
                    cp = add (buf, cp);
                }

-               putfmt (name, cp, out);
+               putfmt (name, cp, &eai, out);

                free (cp);
                continue;
 
                free (cp);
                continue;
 


@@ -637,10 +703,45 @@ main (int argc, char **argv)
 #endif /* ! TLS_SUPPORT */
     }
 
 #endif /* ! TLS_SUPPORT */
     }
 

+    if (tls == 1)
+       tlsflag = S_STARTTLS;
+    else if (tls == 2)
+       tlsflag = S_INITTLS;
+    else
+       tlsflag = 0;
+
+    if (noverify)
+       tlsflag |= S_NOVERIFY;
+
+    /*
+     * If we were given any oauth flags, store the appropriate profile
+     * entries and make sure an authservice was given (we have to do this
+     * here because we aren't guaranteed the authservice will be given on
+     * the command line before the other OAuth flags are given).
+     */
+
+    if (oauth_flag) {
+       int i;
+       char sbuf[128];
+
+       if (auth_svc == NULL) {
+           adios(NULL, "No authentication service given with -authservice");
+       }
+
+       for (i = 0; oauthswitches[i].profname != NULL; i++) {
+               if (oauthswitches[i].value != NULL) {
+                   snprintf(sbuf, sizeof(sbuf),
+                   oauthswitches[i].profname, auth_svc);
+                   sbuf[sizeof(sbuf) - 1] = '\0';
+                   add_profile_entry(sbuf, oauthswitches[i].value);
+               }
+       }
+    }
+

     /* If we are doing a "whom" check */
     if (whomsw) {
        /* This won't work with MTS_SENDMAIL_PIPE. */
     /* If we are doing a "whom" check */
     if (whomsw) {
        /* This won't work with MTS_SENDMAIL_PIPE. */

-       verify_all_addresses (1, envelope);
+        verify_all_addresses (1, eai, envelope, oauth_flag, auth_svc);

        done (0);
     }
 
        done (0);
     }
 


@@ -652,14 +753,15 @@ main (int argc, char **argv)
                   verify_all_addresses with MTS_SENDMAIL_PIPE, but
                   that might require running sendmail as root.  Note
                   that spost didn't verify addresses. */
                   verify_all_addresses with MTS_SENDMAIL_PIPE, but
                   that might require running sendmail as root.  Note
                   that spost didn't verify addresses. */

-               verify_all_addresses (verbose, envelope);
+               verify_all_addresses (verbose, eai, envelope, oauth_flag,
+                                      auth_svc);

            }
            }

-           post (tmpfil, 0, verbose, envelope);
+           post (tmpfil, 0, verbose, eai, envelope, oauth_flag, auth_svc);

        }
        }

-       post (bccfil, 1, verbose, envelope);
+       post (bccfil, 1, verbose, eai, envelope, oauth_flag, auth_svc);

        (void) m_unlink (bccfil);
     } else {
        (void) m_unlink (bccfil);
     } else {

-       post (tmpfil, 0, isatty (1), envelope);
+       post (tmpfil, 0, isatty (1), eai, envelope, oauth_flag, auth_svc);

     }
 
     p_refile (tmpfil);
     }
 
     p_refile (tmpfil);


@@ -669,7 +771,7 @@ main (int argc, char **argv)
        if (partno)
            printf ("Partial Message #%s Processed\n", partno);
        else
        if (partno)
            printf ("Partial Message #%s Processed\n", partno);
        else

-           printf ("Message Processed\n");
+           puts("Message Processed");

     }
 
     done (0);
     }
 
     done (0);


@@ -682,7 +784,7 @@ main (int argc, char **argv)
  */
 
 static void
  */
 
 static void

-putfmt (char *name, char *str, FILE *out)
+putfmt (char *name, char *str, int *eai, FILE *out)

 {
     int count, grp, i, keep;
     char *cp, *pp, *qp;
 {
     int count, grp, i, keep;
     char *cp, *pp, *qp;


@@ -699,16 +801,31 @@ putfmt (char *name, char *str, FILE *out)
        return;
     }
 
        return;
     }
 

+    if (! *eai) {
+        /* Check each header field value to see if it has any 8-bit characters.
+           If it does, enable EAI support. */
+        if (contains8bit(str, NULL)) {
+            if (verbose) {
+                puts("EAI/SMTPUTF8 enabled");
+            }
+
+            /* Enable SMTPUTF8. */
+            *eai = 1;
+
+            /* Enable passing of utf-8 setting to getname()/getadrx(). */
+            enable_eai();
+        }
+    }
+

     if ((i = get_header (name, hdrtab)) == NOTOK) {
     if ((i = get_header (name, hdrtab)) == NOTOK) {

-       if (strncasecmp (name, "nmh-", 4)) {
+        if (strncasecmp (name, "nmh-", 4)) {

            fprintf (out, "%s: %s", name, str);
        } else {
            /* Filter out all Nmh-* headers, because Norm asked.  They
               should never have reached this point.  Warn about any
               that are non-empty. */
            if (strcmp (str, "\n")) {
            fprintf (out, "%s: %s", name, str);
        } else {
            /* Filter out all Nmh-* headers, because Norm asked.  They
               should never have reached this point.  Warn about any
               that are non-empty. */
            if (strcmp (str, "\n")) {

-               char *newline = strchr (str, '\n');
-               if (newline) *newline = '\0';
+                trim_suffix_c(str, '\n');

                if (! whomsw) {
                    advise (NULL, "ignoring header line -- %s: %s", name, str);
                }
                if (! whomsw) {
                    advise (NULL, "ignoring header line -- %s: %s", name, str);
                }


@@ -730,7 +847,7 @@ putfmt (char *name, char *str, FILE *out)
     msgflags |= (hdr->set & ~(MVIS | MINV));
 
     if (hdr->flags & HSUB)
     msgflags |= (hdr->set & ~(MVIS | MINV));
 
     if (hdr->flags & HSUB)

-       subject = subject ? add (str, add ("\t", subject)) : getcpy (str);
+       subject = subject ? add (str, add ("\t", subject)) : mh_xstrdup(str);

     if (hdr->flags & HFCC) {
        if ((cp = strrchr(str, '\n')))
            *cp = 0;
     if (hdr->flags & HFCC) {
        if ((cp = strrchr(str, '\n')))
            *cp = 0;


@@ -741,14 +858,23 @@ putfmt (char *name, char *str, FILE *out)
        insert_fcc (hdr, pp);
        return;
     }
        insert_fcc (hdr, pp);
        return;
     }

-
+    if (hdr->flags & HCTE) {
+        if (strncasecmp (str, "7bit", 4) == 0) {
+            cte = SEVENBIT;
+        } else if (strncasecmp (str, "8bit", 4) == 0) {
+            cte = EIGHTBIT;
+        } else if (strncasecmp (str, "binary", 6) == 0) {
+            cte = BINARY;
+        }
+    }

     if (!(hdr->flags & HADR)) {
        fprintf (out, "%s: %s", name, str);
        return;
     }
 
     tmpaddrs.m_next = NULL;
     if (!(hdr->flags & HADR)) {
        fprintf (out, "%s: %s", name, str);
        return;
     }
 
     tmpaddrs.m_next = NULL;

-    for (count = 0; (cp = getname (str)); count++)
+
+    for (count = 0; (cp = getname (str)); count++) {

        if ((mp = getm (cp, NULL, 0, error, sizeof(error)))) {
            if (tmpaddrs.m_next)
                np->m_next = mp;
        if ((mp = getm (cp, NULL, 0, error, sizeof(error)))) {
            if (tmpaddrs.m_next)
                np->m_next = mp;


@@ -763,6 +889,7 @@ putfmt (char *name, char *str, FILE *out)
            else
                badmsg++;
        }
            else
                badmsg++;
        }

+    }

 
     if (count < 1) {
        if (hdr->flags & HNIL)
 
     if (count < 1) {
        if (hdr->flags & HNIL)


@@ -935,7 +1062,7 @@ putfmt (char *name, char *str, FILE *out)
         * Strip off any trailing newlines
         */
 
         * Strip off any trailing newlines
         */
 

-       while (strlen(fullfrom) > 0 && fullfrom[strlen(fullfrom) - 1] == '\n') {
+       while (*fullfrom && fullfrom[strlen(fullfrom) - 1] == '\n') {

            fullfrom[strlen(fullfrom) - 1] = '\0';
        }
     }
            fullfrom[strlen(fullfrom) - 1] = '\0';
        }
     }


@@ -1111,7 +1238,7 @@ putadr (char *name, char *aka, struct mailname *mp, FILE *out, unsigned int flag
     }
 
     if (*aka && mp->m_type != UUCPHOST && !mp->m_pers)
     }
 
     if (*aka && mp->m_type != UUCPHOST && !mp->m_pers)

-       mp->m_pers = getcpy (aka);
+       mp->m_pers = mh_xstrdup(aka);

     if (format) {
        if (mp->m_gname) {
            snprintf (buffer, sizeof(buffer), "%s;", mp->m_gname);
     if (format) {
        if (mp->m_gname) {
            snprintf (buffer, sizeof(buffer), "%s;", mp->m_gname);


@@ -1227,7 +1354,7 @@ pl (void)
     printf ("\n\t-- Folder Copies --\nfcc:\t");
     for (i = 0; i < fccind; i++)
        printf ("%s%s", fccfold[i], i + 1 < fccind ? ",\n\t" : "");
     printf ("\n\t-- Folder Copies --\nfcc:\t");
     for (i = 0; i < fccind; i++)
        printf ("%s%s", fccfold[i], i + 1 < fccind ? ",\n\t" : "");

-    printf ("\n");
+    putchar('\n');

 }
 
 
 }
 
 


@@ -1283,7 +1410,7 @@ insert_fcc (struct headers *hdr, char *pp)
 
     if (fccind >= FCCS)
        adios (NULL, "too many %ss", hdr->value);
 
     if (fccind >= FCCS)
        adios (NULL, "too many %ss", hdr->value);

-    fccfold[fccind++] = getcpy (cp);
+    fccfold[fccind++] = mh_xstrdup(cp);

 }
 
 /*
 }
 
 /*


@@ -1421,7 +1548,7 @@ find_prefix (void)
     if ((in = fopen (tmpfil, "r")) == NULL)
        adios (tmpfil, "unable to re-open");
 
     if ((in = fopen (tmpfil, "r")) == NULL)
        adios (tmpfil, "unable to re-open");
 

-    while (fgets (buffer, sizeof(buffer) - 1, in))
+    while (fgets (buffer, sizeof buffer, in))

        if (buffer[0] == '-' && buffer[1] == '-') {
            char *cp;
 
        if (buffer[0] == '-' && buffer[1] == '-') {
            char *cp;
 


@@ -1466,7 +1593,7 @@ do_addresses (int bccque, int talk)
     for (lp = localaddrs.m_next; lp; lp = lp->m_next)
        if (lp->m_bcc ? bccque : !bccque) {
            if (talk && !state)
     for (lp = localaddrs.m_next; lp; lp = lp->m_next)
        if (lp->m_bcc ? bccque : !bccque) {
            if (talk && !state)

-               printf ("  -- Local Recipients --\n");
+               puts("  -- Local Recipients --");

            do_an_address (lp, talk);
            state++;
        }
            do_an_address (lp, talk);
            state++;
        }


@@ -1475,7 +1602,7 @@ do_addresses (int bccque, int talk)
     for (lp = uuaddrs.m_next; lp; lp = lp->m_next)
        if (lp->m_bcc ? bccque : !bccque) {
            if (talk && !state)
     for (lp = uuaddrs.m_next; lp; lp = lp->m_next)
        if (lp->m_bcc ? bccque : !bccque) {
            if (talk && !state)

-               printf ("  -- UUCP Recipients --\n");
+               puts("  -- UUCP Recipients --");

            do_an_address (lp, talk);
            state++;
        }
            do_an_address (lp, talk);
            state++;
        }


@@ -1484,7 +1611,7 @@ do_addresses (int bccque, int talk)
     for (lp = netaddrs.m_next; lp; lp = lp->m_next)
        if (lp->m_bcc ? bccque : !bccque) {
            if (talk && !state)
     for (lp = netaddrs.m_next; lp; lp = lp->m_next)
        if (lp->m_bcc ? bccque : !bccque) {
            if (talk && !state)

-               printf ("  -- Network Recipients --\n");
+               puts("  -- Network Recipients --");

            do_an_address (lp, talk);
            state++;
        }
            do_an_address (lp, talk);
            state++;
        }


@@ -1506,9 +1633,9 @@ do_addresses (int bccque, int talk)
  */
 
 static void
  */
 
 static void

-post (char *file, int bccque, int talk, char *envelope)
+post (char *file, int bccque, int talk, int eai, char *envelope,
+      int oauth_flag, char *auth_svc)

 {
 {

-    int fd;

     int        retval, i;
     pid_t child_id;
 
     int        retval, i;
     pid_t child_id;
 


@@ -1517,7 +1644,7 @@ post (char *file, int bccque, int talk, char *envelope)
            printf (" -- Posting for %s Recipients --\n",
                    bccque ? "Blind" : "Sighted");
        else
            printf (" -- Posting for %s Recipients --\n",
                    bccque ? "Blind" : "Sighted");
        else

-           printf (" -- Posting for All Recipients --\n");
+           puts(" -- Posting for All Recipients --");

     }
 
     sigon ();
     }
 
     sigon ();


@@ -1554,15 +1681,33 @@ post (char *file, int bccque, int talk, char *envelope)
                break;
        }
     } else {
                break;
        }
     } else {

-        if (rp_isbad (retval = sm_init (clientsw, serversw, port, watch,
-                                        verbose, snoop, sasl, saslssf,
-                                       saslmech, user, tls))  ||
-            rp_isbad (retval = sm_winit (envelope)))
+        const int fd = open (file, O_RDONLY);
+        int eightbit = 0;
+
+        if (fd == NOTOK) {
+          die (file, "unable to re-open");
+        }
+
+        if (msgflags & MMIM  &&  cte != UNKNOWN) {
+            /* MIME message with C-T-E header.  (BINARYMIME isn't
+               supported, use 8BITMIME instead for binary.) */
+            eightbit = cte != SEVENBIT;
+        } else {
+            if (scan_input (fd, &eightbit) == NOTOK) {
+                close (fd);
+                die (file, "problem reading from");
+            }
+        }
+
+       if (rp_isbad (retval = sm_init (clientsw, serversw, port, watch,
+                                       verbose, snoop, sasl, saslmech, user,
+                                       oauth_flag ? auth_svc : NULL, tlsflag))
+               || rp_isbad (retval = sm_winit (envelope, eai, eightbit))) {
+           close (fd);

            die (NULL, "problem initializing server; %s", rp_string (retval));
            die (NULL, "problem initializing server; %s", rp_string (retval));

+       }

 
         do_addresses (bccque, talk && verbose);
 
         do_addresses (bccque, talk && verbose);

-        if ((fd = open (file, O_RDONLY)) == NOTOK)
-          die (file, "unable to re-open");

         do_text (file, fd);
         close (fd);
         fflush (stdout);
         do_text (file, fd);
         close (fd);
         fflush (stdout);


@@ -1575,7 +1720,7 @@ post (char *file, int bccque, int talk, char *envelope)
                printf (" -- %s Recipient Copies Posted --\n",
                        bccque ? "Blind" : "Sighted");
             else
                printf (" -- %s Recipient Copies Posted --\n",
                        bccque ? "Blind" : "Sighted");
             else

-               printf (" -- Recipient Copies Posted --\n");
+               puts(" -- Recipient Copies Posted --");

         }
 
         fflush (stdout);
         }
 
         fflush (stdout);


@@ -1586,40 +1731,46 @@ post (char *file, int bccque, int talk, char *envelope)
 /* Address Verification */
 
 static void
 /* Address Verification */
 
 static void

-verify_all_addresses (int talk, char *envelope)
+verify_all_addresses (int talk, int eai, char *envelope, int oauth_flag,
+                      char *auth_svc)

 {
     int retval;
     struct mailname *lp;
 
     sigon ();
 
 {
     int retval;
     struct mailname *lp;
 
     sigon ();
 

-    if (!whomsw || checksw)
+    if (!whomsw || checksw) {
+        /* Not sending message body, so don't need to use 8BITMIME. */
+        const int eightbit = 0;
+

        if (rp_isbad (retval = sm_init (clientsw, serversw, port, watch,
        if (rp_isbad (retval = sm_init (clientsw, serversw, port, watch,

-                                       verbose, snoop, sasl, saslssf,
-                                       saslmech, user, tls))
-               || rp_isbad (retval = sm_winit (envelope)))
+                                       verbose, snoop, sasl, saslmech, user,
+                                       oauth_flag ? auth_svc : NULL, tlsflag))
+               || rp_isbad (retval = sm_winit (envelope, eai, eightbit))) {

            die (NULL, "problem initializing server; %s", rp_string (retval));
            die (NULL, "problem initializing server; %s", rp_string (retval));

+       }
+    }

 
     if (talk && !whomsw)
 
     if (talk && !whomsw)

-       printf (" -- Address Verification --\n");
+       puts(" -- Address Verification --");

     if (talk && localaddrs.m_next)
     if (talk && localaddrs.m_next)

-       printf ("  -- Local Recipients --\n");
+       puts("  -- Local Recipients --");

     for (lp = localaddrs.m_next; lp; lp = lp->m_next)
        do_an_address (lp, talk);
 
     if (talk && uuaddrs.m_next)
     for (lp = localaddrs.m_next; lp; lp = lp->m_next)
        do_an_address (lp, talk);
 
     if (talk && uuaddrs.m_next)

-       printf ("  -- UUCP Recipients --\n");
+       puts("  -- UUCP Recipients --");

     for (lp = uuaddrs.m_next; lp; lp = lp->m_next)
        do_an_address (lp, talk);
 
     if (talk && netaddrs.m_next)
     for (lp = uuaddrs.m_next; lp; lp = lp->m_next)
        do_an_address (lp, talk);
 
     if (talk && netaddrs.m_next)

-       printf ("  -- Network Recipients --\n");
+       puts("  -- Network Recipients --");

     for (lp = netaddrs.m_next; lp; lp = lp->m_next)
        do_an_address (lp, talk);
 
     chkadr ();
     if (talk && !whomsw)
     for (lp = netaddrs.m_next; lp; lp = lp->m_next)
        do_an_address (lp, talk);
 
     chkadr ();
     if (talk && !whomsw)

-       printf (" -- Address Verification Successful --\n");
+       puts(" -- Address Verification Successful --");

 
     if (!whomsw || checksw)
        sm_end (DONE);
 
     if (!whomsw || checksw)
        sm_end (DONE);


@@ -1671,7 +1822,7 @@ do_an_address (struct mailname *lp, int talk)
                         lp->m_type != UUCPHOST ? lp->m_path : NULL)) {
        case RP_OK: 
            if (talk)
                         lp->m_type != UUCPHOST ? lp->m_path : NULL)) {
        case RP_OK: 
            if (talk)

-               printf ("address ok\n");
+               puts("address ok");

            break;
 
        case RP_NO: 
            break;
 
        case RP_NO: 


@@ -1716,6 +1867,7 @@ do_text (char *file, int fd)
        case RP_NO: 
        case RP_NDEL: 
            die (NULL, "posting failed; %s", rp_string (retval));
        case RP_NO: 
        case RP_NDEL: 
            die (NULL, "posting failed; %s", rp_string (retval));

+           /* FALLTHRU */

 
        default: 
            die (NULL, "unexpected response; %s", rp_string (retval));
 
        default: 
            die (NULL, "unexpected response; %s", rp_string (retval));


@@ -1781,11 +1933,11 @@ p_refile (char *file)
        return;
 
     if (verbose)
        return;
 
     if (verbose)

-       printf (" -- Filing Folder Copies --\n");
+       puts(" -- Filing Folder Copies --");

     for (i = 0; i < fccind; i++)
        fcc (file, fccfold[i]);
     if (verbose)
     for (i = 0; i < fccind; i++)
        fcc (file, fccfold[i]);
     if (verbose)

-       printf (" -- Folder Copies Filed --\n");
+       puts(" -- Folder Copies Filed --");

 }
 
 
 }
 
 


@@ -1840,7 +1992,7 @@ fcc (char *file, char *folder)
                pidstatus (status, verbose ? stdout : stderr, NULL);
            } else {
                if (verbose)
                pidstatus (status, verbose ? stdout : stderr, NULL);
            } else {
                if (verbose)

-                   printf ("folder ok\n");
+                   puts("folder ok");

            }
     }
 
            }
     }