Newer versions of Automake want to include the test-driver script,

[nmh] / uip / msgchk.c

diff --git a/uip/msgchk.c b/uip/msgchk.c
index 39a2918d2c9b8eb3078fa35a4578d52bad4a1af7..e0eaeb8b8327766d9a9bfd66b27f9a5314a73337 100644 (file)
--- a/uip/msgchk.c
+++ b/uip/msgchk.c
@@ -31,8 +31,9 @@
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
     X("snoop", -5, SNOOPSW) \
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
     X("snoop", -5, SNOOPSW) \

-    X("sasl", SASLminc(-4), SASLSW) \
-    X("saslmech", SASLminc(-5), SASLMECHSW) \
+    X("sasl", SASLminc(4), SASLSW) \
+    X("saslmech", SASLminc(5), SASLMECHSW) \
+    X("authservice", SASLminc(0), AUTHSERVICESW) \

     X("proxy command", 0, PROXYSW) \
 
 #define X(sw, minchars, id) id,
     X("proxy command", 0, PROXYSW) \
 
 #define X(sw, minchars, id) id,


@@ -71,7 +72,7 @@ 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,
 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 *, const char *);

 
 
 int
 
 
 int


@@ -81,15 +82,11 @@ main (int argc, char **argv)
     int status = 0, sasl = 0;
     int snoop = 0, vecp = 0;
     char *cp, *host = NULL, *port = NULL, *user = NULL, *proxy = NULL;
     int status = 0, sasl = 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;
 
     char **argp, **arguments, *vec[MAXVEC];
     struct passwd *pw;
 

-    setlocale(LC_ALL, "");
-    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 (invo_name);
 


@@ -164,6 +161,15 @@ main (int argc, char **argv)
                        adios (NULL, "missing argument to %s", argp[-2]);
                    continue;
 
                        adios (NULL, "missing argument to %s", argp[-2]);
                    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]);


@@ -196,11 +202,11 @@ main (int argc, char **argv)
     if (host) {
        if (vecp == 0) {
            status = remotemail (host, port, user, proxy, notifysw, 1,
     if (host) {
        if (vecp == 0) {
            status = remotemail (host, port, user, proxy, notifysw, 1,

-                                snoop, sasl, saslmech);
+                                snoop, sasl, saslmech, 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, auth_svc);

        }
     } else {
        if (user == NULL) user = getusername ();
        }
     } else {
        if (user == NULL) user = getusername ();


@@ -324,15 +330,27 @@ extern char response[];
 
 static int
 remotemail (char *host, char *port, char *user, char *proxy, int notifysw,
 
 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,
+           const char *auth_svc)

 {
     int nmsgs, nbytes, status;
     struct nmh_creds creds = { 0, 0, 0 };
 
 {
     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 */
     /* open the POP connection */

-    nmh_get_credentials (host, user, sasl, &creds);

     if (pop_init (host, port, creds.user, creds.password, proxy, snoop, sasl,
     if (pop_init (host, port, creds.user, creds.password, proxy, snoop, sasl,

-                 saslmech) == NOTOK
+                 saslmech, auth_svc) == NOTOK

            || pop_stat (&nmsgs, &nbytes) == NOTOK     /* check for messages  */
            || pop_quit () == NOTOK) {                 /* quit POP connection */
        advise (NULL, "%s", response);
            || pop_stat (&nmsgs, &nbytes) == NOTOK     /* check for messages  */
            || pop_quit () == NOTOK) {                 /* quit POP connection */
        advise (NULL, "%s", response);