Reverted commit 9a4b4a3d3b27fe4a7ff6d0b8724ce1c06b5917eb.

[nmh] / uip / msgchk.c

diff --git a/uip/msgchk.c b/uip/msgchk.c
index d7b2c2f04394497dfc6b98970f5ab3ae822638a9..eed61cd2d4985ab7b186c2d670995d6adff58742 100644 (file)
--- a/uip/msgchk.c
+++ b/uip/msgchk.c
@@ -38,10 +38,13 @@
     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,
@@ -87,7 +90,7 @@ int
 main (int argc, char **argv)
 {
     int datesw = 1, notifysw = NT_ALL;
-    int status = 0, sasl = 0, tls = 0;
+    int status = 0, sasl = 0, tls = 0, noverify = 0;
     int snoop = 0, vecp = 0;
     char *cp, *host = NULL, *port = NULL, *user = NULL, *proxy = NULL;
     char buf[BUFSIZ], *saslmech = NULL, *auth_svc = NULL;
@@ -164,6 +167,10 @@ main (int argc, char **argv)
                    sasl++;
                    continue;
                
+               case NOSASLSW:
+                   sasl = 0;
+                   continue;
+
                case SASLMECHSW:
                    if (!(saslmech = *argp++) || *saslmech == '-')
                        adios (NULL, "missing argument to %s", argp[-2]);
@@ -177,6 +184,14 @@ main (int argc, char **argv)
                    tls = 0;
                    continue;
 
+               case CERTVERSW:
+                   noverify = 0;
+                   continue;
+
+               case NOCERTVERSW:
+                   noverify++;
+                   continue;
+
                case AUTHSERVICESW:
 #ifdef OAUTH_SUPPORT
                    if (!(auth_svc = *argp++) || *auth_svc == '-')
@@ -216,13 +231,21 @@ main (int argc, char **argv)
        vec[vecp] = NULL;
 
     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,
-                                snoop, sasl, saslmech, tls, auth_svc);
+                                snoop, sasl, saslmech, tlsflag, auth_svc);
        } else {
            for (vecp = 0; vec[vecp]; vecp++)
                status += remotemail (host, port, vec[vecp], proxy, notifysw, 0,
-                                     snoop, sasl, saslmech, tls, auth_svc);
+                                     snoop, sasl, saslmech, tlsflag, auth_svc);
        }
     } else {
        if (user == NULL) user = getusername ();
@@ -336,7 +359,7 @@ 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)
-       printf ("\n");
+       putchar('\n');
 
     return status;
 }
@@ -350,23 +373,20 @@ remotemail (char *host, char *port, char *user, char *proxy, int notifysw,
            const char *auth_svc)
 {
     int nmsgs, nbytes, status;
-    struct nmh_creds creds = { 0, 0, 0 };
 
     if (auth_svc == NULL) {
        if (saslmech  &&  ! strcasecmp(saslmech, "xoauth2")) {
            adios (NULL, "must specify -authservice with -saslmech xoauth2");
        }
-       nmh_get_credentials (host, user, sasl, &creds);
     } else {
        if (user == NULL) {
            adios (NULL, "must specify -user with -saslmech xoauth2");
        }
-       creds.user = user;
     }
 
     /* open the POP connection */
-    if (pop_init (host, port, creds.user, creds.password, proxy, snoop, sasl,
-                 saslmech, tls, auth_svc) == NOTOK
+    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 */
        advise (NULL, "%s", response);