X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/52a236230220232fd632b5aa88eb9bb31dba346e..1e1fb5ef266efa509026583cfc08ff3e38cdcaf1:/uip/msgchk.c

diff --git a/uip/msgchk.c b/uip/msgchk.c
index af280f59..d7b2c2f0 100644
--- a/uip/msgchk.c
+++ b/uip/msgchk.c
@@ -20,6 +20,12 @@
 # define SASLminc(a)  0
 #endif
 
+#ifndef TLS_SUPPORT
+# define TLSminc(a) (a)
+#else
+# define TLSminc(a)  0
+#endif
+
 #define MSGCHK_SWITCHES \
     X("date", 0, DATESW) \
     X("nodate", 0, NDATESW) \
@@ -30,9 +36,12 @@
     X("port name/number", 0, PORTSW) \
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
-    X("snoop", -5, SNOOPSW) \
-    X("sasl", SASLminc(-4), SASLSW) \
-    X("saslmech", SASLminc(-5), SASLMECHSW) \
+    X("snoop", 0, SNOOPSW) \
+    X("sasl", SASLminc(4), SASLSW) \
+    X("saslmech", SASLminc(5), SASLMECHSW) \
+    X("authservice", SASLminc(0), AUTHSERVICESW) \
+    X("initialtls", TLSminc(-10), INITTLSSW) \
+    X("notls", TLSminc(-5), NOTLSSW) \
     X("proxy command", 0, PROXYSW) \
 
 #define X(sw, minchars, id) id,
@@ -71,29 +80,23 @@ DEFINE_SWITCH_ARRAY(MSGCHK, switches);
 static int donote (char *, int);
 static int checkmail (char *, char *, int, int, int);
 static int remotemail (char *, char *, char *, char *, int, int, int, int,
-		       char *);
+		       char *, int, const char *);
 
 
 int
 main (int argc, char **argv)
 {
     int datesw = 1, notifysw = NT_ALL;
-    int status = 0, sasl = 0;
+    int status = 0, sasl = 0, tls = 0;
     int snoop = 0, vecp = 0;
     char *cp, *host = NULL, *port = NULL, *user = NULL, *proxy = NULL;
-    char buf[BUFSIZ], *saslmech = NULL; 
+    char buf[BUFSIZ], *saslmech = NULL, *auth_svc = NULL;
     char **argp, **arguments, *vec[MAXVEC];
     struct passwd *pw;
 
-#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);
+    mts_init ();
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -166,6 +169,23 @@ main (int argc, char **argv)
 			adios (NULL, "missing argument to %s", argp[-2]);
 		    continue;
 
+		case INITTLSSW:
+		    tls++;
+		    continue;
+
+		case NOTLSSW:
+		    tls = 0;
+		    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]);
@@ -198,11 +218,11 @@ main (int argc, char **argv)
     if (host) {
 	if (vecp == 0) {
 	    status = remotemail (host, port, user, proxy, notifysw, 1,
-				 snoop, sasl, saslmech);
+				 snoop, sasl, saslmech, tls, auth_svc);
 	} else {
 	    for (vecp = 0; vec[vecp]; vecp++)
 		status += remotemail (host, port, vec[vecp], proxy, notifysw, 0,
-				      snoop, sasl, saslmech);
+				      snoop, sasl, saslmech, tls, auth_svc);
 	}
     } else {
 	if (user == NULL) user = getusername ();
@@ -285,7 +305,10 @@ checkmail (char *user, char *home, int datesw, int notifysw, int personal)
 
     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))
@@ -323,15 +346,27 @@ 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;
     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 */
-    nmh_get_credentials (host, user, sasl, &creds);
     if (pop_init (host, port, creds.user, creds.password, proxy, snoop, sasl,
-		  saslmech) == NOTOK
+		  saslmech, tls, auth_svc) == NOTOK
 	    || pop_stat (&nmsgs, &nbytes) == NOTOK     /* check for messages  */
 	    || pop_quit () == NOTOK) {                 /* quit POP connection */
 	advise (NULL, "%s", response);
@@ -340,7 +375,11 @@ remotemail (char *host, char *port, char *user, char *proxy, int notifysw,
 
     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)",
 		    nmsgs, nmsgs != 1 ? "s" : "", nbytes);
 	}