Add -noprefer switch to mhshow, mhstore, and mhlist

[nmh] / uip / msgchk.c

diff --git a/uip/msgchk.c b/uip/msgchk.c
index c7f32f5ba843325fed59e19c3b59b66e06db6b4b..73ed72845db6d372451bc1bde3a79aa588ffdb87 100644 (file)
--- a/uip/msgchk.c
+++ b/uip/msgchk.c
@@ -1,6 +1,4 @@
-
-/*
- * msgchk.c -- check for mail
+/* msgchk.c -- check for mail

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


@@ -10,17 +8,10 @@
 #include <h/mh.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mh.h>
 #include <h/mts.h>
 #include <h/tws.h>

+#include <h/utils.h>

 #include <pwd.h>
 
 #include <pwd.h>
 

-#ifdef POP
-# include <h/popsbr.h>
-#endif
-
-#ifndef        POP
-# define POPminc(a) (a)
-#else
-# define POPminc(a)  0
-#endif
+#include <h/popsbr.h>

 
 #ifndef CYRUS_SASL
 # define SASLminc(a) (a)
 
 #ifndef CYRUS_SASL
 # define SASLminc(a) (a)


@@ -28,35 +19,40 @@
 # define SASLminc(a)  0
 #endif
 
 # define SASLminc(a)  0
 #endif
 

-static struct swit switches[] = {
-#define        DATESW                   0
-    { "date", 0 },
-#define        NDATESW                  1
-    { "nodate", 0 },
-#define        NOTESW                   2
-    { "notify type", 0 },
-#define        NNOTESW                  3
-    { "nonotify type", 0 },
-#define        HOSTSW                   4
-    { "host hostname", POPminc (-4) },
-#define        USERSW                   5
-    { "user username", POPminc (-4) },
-#define PORTSW                  6
-    { "port name/number", POPminc(-4) },
-#define VERSIONSW                7
-    { "version", 0 },
-#define        HELPSW                   8
-    { "help", 0 },
-#define SNOOPSW                  9
-    { "snoop", -5 },
-#define SASLSW                  10
-    { "sasl", SASLminc(-4) },
-#define SASLMECHSW             11
-    { "saslmech", SASLminc(-5) },
-#define PROXYSW                12
-    { "proxy command", POPminc(-5) },
-    { NULL, 0 }
-};
+#ifndef TLS_SUPPORT
+# define TLSminc(a) (a)
+#else
+# define TLSminc(a)  0
+#endif
+
+#define MSGCHK_SWITCHES \
+    X("date", 0, DATESW) \
+    X("nodate", 0, NDATESW) \
+    X("notify type", 0, NOTESW) \
+    X("nonotify type", 0, NNOTESW) \
+    X("host hostname", 0, HOSTSW) \
+    X("user username", 0, USERSW) \
+    X("port name/number", 0, PORTSW) \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+    X("snoop", 0, SNOOPSW) \
+    X("sasl", SASLminc(4), SASLSW) \
+    X("nosasl", SASLminc(6), NOSASLSW) \
+    X("saslmech", SASLminc(5), SASLMECHSW) \
+    X("authservice", SASLminc(0), AUTHSERVICESW) \
+    X("initialtls", TLSminc(-10), INITTLSSW) \
+    X("notls", TLSminc(-5), NOTLSSW) \
+    X("certverify", TLSminc(-10), CERTVERSW) \
+    X("nocertverify", TLSminc(-12), NOCERTVERSW) \
+    X("proxy command", 0, PROXYSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(MSGCHK);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(MSGCHK, switches);
+#undef X

 
 /*
  * Maximum numbers of users we can check (plus
 
 /*
  * Maximum numbers of users we can check (plus


@@ -65,6 +61,8 @@ static struct swit switches[] = {
 #define MAXVEC  51
 
 #define        NT_NONE 0x0
 #define MAXVEC  51
 
 #define        NT_NONE 0x0

+#ifdef NT_NONE
+#endif /* Use NT_NONE to prevent warning from gcc -Wunused-macros. */

 #define        NT_MAIL 0x1
 #define        NT_NMAI 0x2
 #define        NT_ALL  (NT_MAIL | NT_NMAI)
 #define        NT_MAIL 0x1
 #define        NT_NMAI 0x2
 #define        NT_ALL  (NT_MAIL | NT_NMAI)


@@ -81,50 +79,30 @@ static struct swit switches[] = {
 /*
  * static prototypes
  */
 /*
  * static prototypes
  */

-static int donote (char *, int);
+static int donote (char *, int) PURE;

 static int checkmail (char *, char *, int, int, int);
 static int checkmail (char *, char *, int, int, int);

-
-#ifdef POP

 static int remotemail (char *, char *, char *, char *, int, int, int, int,
 static int remotemail (char *, char *, char *, char *, int, int, int, int,

-                      char *);
-#endif
+                      char *, int, const char *);

 
 
 int
 main (int argc, char **argv)
 {
     int datesw = 1, notifysw = NT_ALL;
 
 
 int
 main (int argc, char **argv)
 {
     int datesw = 1, notifysw = NT_ALL;

-    int status = 0, sasl = 0;
+    int status = 0, sasl = 0, tls = 0, noverify = 0;

     int snoop = 0, vecp = 0;
     int snoop = 0, vecp = 0;

-    char *cp, *host = NULL, *port = NULL, *user, *proxy = NULL; 
-    char buf[BUFSIZ], *saslmech = NULL; 
+    char *cp, *host = NULL, *port = NULL, *user = NULL, *proxy = NULL;
+    char buf[BUFSIZ], *saslmech = NULL, *auth_svc = NULL;

     char **argp, **arguments, *vec[MAXVEC];
     struct passwd *pw;
 
     char **argp, **arguments, *vec[MAXVEC];
     struct passwd *pw;
 

-#ifdef HESIOD
-    struct hes_postoffice *po;
-    char *tmphost;
-#endif
-
-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
-
-    /* read user profile/context */
-    context_read();
+    if (nmh_init(argv[0], 1)) { return 1; }

 
 

-    mts_init (invo_name);
-    user = getusername();
+    mts_init ();

 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 

-#ifdef POP
-    if ((cp = getenv ("MHPOPDEBUG")) && *cp)
-       snoop++;
-#endif
-

     while ((cp = *argp++)) {
        if (*cp == '-') {
            switch (smatch (++cp, switches)) {
     while ((cp = *argp++)) {
        if (*cp == '-') {
            switch (smatch (++cp, switches)) {


@@ -138,10 +116,10 @@ main (int argc, char **argv)
                    snprintf (buf, sizeof(buf), "%s [switches] [users ...]",
                        invo_name);
                    print_help (buf, switches, 1);
                    snprintf (buf, sizeof(buf), "%s [switches] [users ...]",
                        invo_name);
                    print_help (buf, switches, 1);

-                   done (1);
+                   done (0);

                case VERSIONSW:
                    print_version(invo_name);
                case VERSIONSW:
                    print_version(invo_name);

-                   done (1);
+                   done (0);

 
                case DATESW:
                    datesw++;
 
                case DATESW:
                    datesw++;


@@ -176,8 +154,7 @@ main (int argc, char **argv)
                        adios (NULL, "missing argument to %s", argp[-2]);
                    if (vecp >= MAXVEC-1)
                        adios (NULL, "you can only check %d users at a time", MAXVEC-1);
                        adios (NULL, "missing argument to %s", argp[-2]);
                    if (vecp >= MAXVEC-1)
                        adios (NULL, "you can only check %d users at a time", MAXVEC-1);

-                   else
-                       vec[vecp++] = cp;
+                    user = vec[vecp++] = cp;

                    continue;
 
                case SNOOPSW:
                    continue;
 
                case SNOOPSW:


@@ -188,11 +165,40 @@ main (int argc, char **argv)
                    sasl++;
                    continue;
                
                    sasl++;
                    continue;
                

+               case NOSASLSW:
+                   sasl = 0;
+                   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 INITTLSSW:
+                   tls++;
+                   continue;
+
+               case NOTLSSW:
+                   tls = 0;
+                   continue;
+
+               case CERTVERSW:
+                   noverify = 0;
+                   continue;
+
+               case NOCERTVERSW:
+                   noverify++;
+                   continue;
+
+               case AUTHSERVICESW:
+#ifdef OAUTH_SUPPORT
+                   if (!(auth_svc = *argp++) || *auth_svc == '-')
+                       adios (NULL, "missing argument to %s", argp[-2]);
+#else
+                   adios (NULL, "not built with OAuth support");
+#endif
+                   continue;
+

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


@@ -201,11 +207,9 @@ main (int argc, char **argv)
        }
        if (vecp >= MAXVEC-1)
            adios (NULL, "you can only check %d users at a time", MAXVEC-1);
        }
        if (vecp >= MAXVEC-1)
            adios (NULL, "you can only check %d users at a time", MAXVEC-1);

-       else
-           vec[vecp++] = cp;
+        vec[vecp++] = cp;

     }
 
     }
 

-#ifdef POP

     /*
      * If -host is not specified by user
      */
     /*
      * If -host is not specified by user
      */


@@ -219,61 +223,67 @@ main (int argc, char **argv)
     }
     if (!host || !*host)
        host = NULL;
     }
     if (!host || !*host)
        host = NULL;

-#endif /* POP */

 
     if (vecp != 0)
        vec[vecp] = NULL;
 
 
     if (vecp != 0)
        vec[vecp] = NULL;
 

-#ifdef POP

     if (host) {
     if (host) {

+       int tlsflag = 0;
+
+       if (tls)
+           tlsflag |= P_INITTLS;
+
+       if (noverify)
+           tlsflag |= P_NOVERIFY;
+

        if (vecp == 0) {
            status = remotemail (host, port, user, proxy, notifysw, 1,
        if (vecp == 0) {
            status = remotemail (host, port, user, proxy, notifysw, 1,

-                                snoop, sasl, saslmech);
+                                snoop, sasl, saslmech, tlsflag, auth_svc);

        } else {
            for (vecp = 0; vec[vecp]; vecp++)
                status += remotemail (host, port, vec[vecp], proxy, notifysw, 0,
        } else {
            for (vecp = 0; vec[vecp]; vecp++)
                status += remotemail (host, port, vec[vecp], proxy, notifysw, 0,

-                                     snoop, sasl, saslmech);
+                                     snoop, sasl, saslmech, tlsflag, auth_svc);

        }
     } else {
        }
     } else {

-#endif /* POP */
-
-    if (vecp == 0) {
-       char *home;
-
-        /* Not sure this check makes sense... */
-       if (!geteuid() || NULL == (home = getenv("HOME"))) {
-           pw = getpwnam (user);
-           if (pw == NULL)
-               adios (NULL, "unable to get information about user");
-           home = pw->pw_dir;
-       }
-       status = checkmail (user, home, datesw, notifysw, 1);
-    } else {
-       for (vecp = 0; vec[vecp]; vecp++) {
-           if ((pw = getpwnam (vec[vecp])))
-               status += checkmail (pw->pw_name, pw->pw_dir, datesw, notifysw, 0);
-           else
-               advise (NULL, "no such user as %s", vec[vecp]);
+       if (user == NULL) user = getusername ();
+       if (vecp == 0) {
+           char *home;
+
+           /* Not sure this check makes sense... */
+           if (!geteuid() || NULL == (home = getenv("HOME"))) {
+               pw = getpwnam (user);
+               if (pw == NULL)
+                   adios (NULL, "unable to get information about user");
+               home = pw->pw_dir;
+           }
+           status = checkmail (user, home, datesw, notifysw, 1);
+       } else {
+           for (vecp = 0; vec[vecp]; vecp++) {
+               if ((pw = getpwnam (vec[vecp])))
+                   status += checkmail (pw->pw_name, pw->pw_dir, datesw, notifysw, 0);
+               else
+                   inform("no such user as %s", vec[vecp]);
+           }

        }
        }

-    }
-#ifdef POP

     }          /* host == NULL */
     }          /* host == NULL */

-#endif

 
     done (status);
     return 1;
 }
 
 
 
     done (status);
     return 1;
 }
 
 

-static struct swit ntswitches[] = {
-#define        NALLSW     0
-    { "all", 0 },
-#define        NMAISW     1
-    { "mail", 0 },
-#define        NNMAISW    2
-    { "nomail", 0 },
-    { NULL, 0 }
-};
+#define NOTE_SWITCHES \
+    X("all", 0, NALLSW) \
+    X("mail", 0, NMAISW) \
+    X("nomail", 0, NNMAISW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(NOTE);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(NOTE, ntswitches);
+#undef X

 
 
 static int
 
 
 static int


@@ -315,7 +325,10 @@ checkmail (char *user, char *home, int datesw, int notifysw, int personal)
 
     if ((mf & UUCPOK) || (mf & MMDFOK)) {
        if (notifysw & NT_MAIL) {
 
     if ((mf & UUCPOK) || (mf & MMDFOK)) {
        if (notifysw & NT_MAIL) {

-           printf (personal ? "You have " : "%s has ", user);
+           if (personal)
+               printf ("You have ");
+           else
+               printf ("%s has ", user);

            if (mf & UUCPOK)
                printf ("%s old-style bell", mf & UUCPOLD ? "old" : "new");
            if ((mf & UUCPOK) && (mf & MMDFOK))
            if (mf & UUCPOK)
                printf ("%s old-style bell", mf & UUCPOLD ? "old" : "new");
            if ((mf & UUCPOK) && (mf & MMDFOK))


@@ -343,42 +356,49 @@ checkmail (char *user, char *home, int datesw, int notifysw, int personal)
        if (datesw && st.st_atime)
            printf ("; last read on %s", dtime (&st.st_atime, 1));
     if (notifysw)
        if (datesw && st.st_atime)
            printf ("; last read on %s", dtime (&st.st_atime, 1));
     if (notifysw)

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

 
     return status;
 }
 
 
 
     return status;
 }
 
 

-#ifdef POP

 extern char response[];
 
 static int
 remotemail (char *host, char *port, char *user, char *proxy, int notifysw,
 extern char response[];
 
 static int
 remotemail (char *host, char *port, char *user, char *proxy, int notifysw,

-           int personal, int snoop, int sasl, char *saslmech)
+           int personal, int snoop, int sasl, char *saslmech, int tls,
+           const char *auth_svc)

 {
     int nmsgs, nbytes, status;
 {
     int nmsgs, nbytes, status;

-    char *pass = NULL;

 
 

-    if (user == NULL)
-       user = getusername ();
-    if (sasl)
-       pass = getusername ();
-    else
-       ruserpass (host, &user, &pass);
+    if (auth_svc == NULL) {
+       if (saslmech  &&  ! strcasecmp(saslmech, "xoauth2")) {
+           adios (NULL, "must specify -authservice with -saslmech xoauth2");
+       }
+    } else {
+       if (user == NULL) {
+           adios (NULL, "must specify -user with -saslmech xoauth2");
+       }
+    }

 
     /* open the POP connection */
 
     /* open the POP connection */

-    if (pop_init (host, port, user, pass, proxy, snoop, sasl, saslmech) == NOTOK
-           || pop_stat (&nmsgs, &nbytes) == NOTOK      /* check for messages  */
-           || pop_quit () == NOTOK) {                  /* quit POP connection */
-       advise (NULL, "%s", response);
+    if (pop_init (host, port, user, proxy, snoop, sasl, saslmech, tls,
+                 auth_svc) == NOTOK
+           || pop_stat (&nmsgs, &nbytes) == NOTOK     /* check for messages  */
+           || pop_quit () == NOTOK) {                 /* quit POP connection */
+       inform("%s", response);

        return 1;
     }
 
     if (nmsgs) {
        if (notifysw & NT_MAIL) {
        return 1;
     }
 
     if (nmsgs) {
        if (notifysw & NT_MAIL) {

-           printf (personal ? "You have " : "%s has ", user);
+           if (personal)
+               printf ("You have ");
+           else
+               printf ("%s has ", user);
+

            printf ("%d message%s (%d bytes)",
            printf ("%d message%s (%d bytes)",

-                   nmsgs, nmsgs != 1 ? "s" : "", nbytes);
+                   nmsgs, PLURALS(nmsgs), nbytes);

        }
        else
            notifysw = 0;
        }
        else
            notifysw = 0;


@@ -397,4 +417,3 @@ remotemail (char *host, char *port, char *user, char *proxy, int notifysw,
 
     return status;
 }
 
     return status;
 }

-#endif /* POP */