# 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", 0 },
-#define USERSW 5
- { "user username", 0 },
-#define PORTSW 6
- { "port name/number", 0 },
-#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", 0 },
- { 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("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,
+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
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, *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;
-#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;
- if ((cp = getenv ("MHPOPDEBUG")) && *cp)
- snoop++;
-
while ((cp = *argp++)) {
if (*cp == '-') {
switch (smatch (++cp, switches)) {
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:
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]);
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);
- }
- } else {
-
- 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;
+ snoop, sasl, saslmech, tls, auth_svc);
}
- 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
+ advise (NULL, "no such user as %s", vec[vecp]);
+ }
}
- }
} /* host == NULL */
done (status);
}
-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
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 (datesw && st.st_atime)
printf ("; last read on %s", dtime (&st.st_atime, 1));
if (notifysw)
- printf ("\n");
+ putchar('\n');
return status;
}
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;
- 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 */
- 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 */
+ 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);
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)",
nmsgs, nmsgs != 1 ? "s" : "", nbytes);
}
projects / nmh / blobdiff