X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmsgchk.c;h=9b56649a79f1b395e265ac6eb4931cd725b8bff2;hp=fdf32d6cfef6ff3fbe4491ec0e66bfb9e370655a;hb=a01a41d031c796b526329a4170eb23f0ac93b949;hpb=7879ea4084333b448c5a3a49c1cb52023e3808d1 diff --git a/uip/msgchk.c b/uip/msgchk.c index fdf32d6..9b56649 100644 --- a/uip/msgchk.c +++ b/uip/msgchk.c @@ -2,11 +2,13 @@ /* * msgchk.c -- check for mail * - * $Id$ + * This code is Copyright (c) 2002, by the authors of nmh. See the + * COPYRIGHT file in the root directory of the nmh distribution for + * complete copyright information. */ #include -#include +#include #include #include @@ -14,32 +16,16 @@ # include #endif -#ifdef HESIOD -# include -#endif - #ifndef POP # define POPminc(a) (a) #else # define POPminc(a) 0 #endif -#ifndef RPOP -# define RPOPminc(a) (a) +#ifndef CYRUS_SASL +# define SASLminc(a) (a) #else -# define RPOPminc(a) 0 -#endif - -#ifndef APOP -# define APOPminc(a) (a) -#else -# define APOPminc(a) 0 -#endif - -#ifndef KPOP -# define KPOPminc(a) (a) -#else -# define KPOPminc(a) 0 +# define SASLminc(a) 0 #endif static struct swit switches[] = { @@ -55,22 +41,20 @@ static struct swit switches[] = { { "host hostname", POPminc (-4) }, #define USERSW 5 { "user username", POPminc (-4) }, -#define APOPSW 6 - { "apop", APOPminc (-4) }, -#define NAPOPSW 7 - { "noapop", APOPminc (-6) }, -#define RPOPSW 8 - { "rpop", RPOPminc (-4) }, -#define NRPOPSW 9 - { "norpop", RPOPminc (-6) }, -#define VERSIONSW 10 +#define PORTSW 6 + { "port name/number", POPminc(-4) }, +#define VERSIONSW 7 { "version", 0 }, -#define HELPSW 11 +#define HELPSW 8 { "help", 0 }, -#define SNOOPSW 12 +#define SNOOPSW 9 { "snoop", -5 }, -#define KPOPSW 13 - { "kpop", KPOPminc (-4) }, +#define SASLSW 10 + { "sasl", SASLminc(-4) }, +#define SASLMECHSW 11 + { "saslmech", SASLminc(-5) }, +#define PROXYSW 12 + { "proxy command", POPminc(-5) }, { NULL, 0 } }; @@ -101,7 +85,8 @@ static int donote (char *, int); static int checkmail (char *, char *, int, int, int); #ifdef POP -static int remotemail (char *, char *, int, int, int, int, int); +static int remotemail (char *, char *, char *, char *, int, int, int, int, + char *); #endif @@ -109,11 +94,11 @@ int main (int argc, char **argv) { int datesw = 1, notifysw = NT_ALL; - int rpop, status = 0; - int kpop = 0; + int status = 0, sasl = 0; int snoop = 0, vecp = 0; uid_t uid; - char *cp, *host = NULL, *user, buf[BUFSIZ]; + char *cp, *host = NULL, *port = NULL, *user, *proxy = NULL; + char buf[BUFSIZ], *saslmech = NULL; char **argp, **arguments, *vec[MAXVEC]; struct passwd *pw; @@ -142,8 +127,6 @@ main (int argc, char **argv) snoop++; #endif - rpop = 0; - while ((cp = *argp++)) { if (*cp == '-') { switch (smatch (++cp, switches)) { @@ -184,6 +167,12 @@ main (int argc, char **argv) if (!(host = *argp++) || *host == '-') adios (NULL, "missing argument to %s", argp[-2]); continue; + + case PORTSW: + if (!(port = *argp++) || *port == '-') + adios (NULL, "missing argument to %s", argp[-2]); + continue; + case USERSW: if (!(cp = *argp++) || *cp == '-') adios (NULL, "missing argument to %s", argp[-2]); @@ -193,26 +182,22 @@ main (int argc, char **argv) vec[vecp++] = cp; continue; - case APOPSW: - rpop = -1; - continue; - case NAPOPSW: - rpop = 0; + case SNOOPSW: + snoop++; continue; - case RPOPSW: - rpop = 1; + case SASLSW: + sasl++; continue; - case NRPOPSW: - rpop = 0; - continue; - - case KPOPSW: - kpop = 1; + + case SASLMECHSW: + if (!(saslmech = *argp++) || *saslmech == '-') + adios (NULL, "missing argument to %s", argp[-2]); continue; - case SNOOPSW: - snoop++; + case PROXYSW: + if (!(proxy = *argp++) || *proxy == '-') + adios (NULL, "missing argument to %s", argp[-2]); continue; } } @@ -227,20 +212,6 @@ main (int argc, char **argv) * If -host is not specified by user */ if (!host || !*host) { -# ifdef HESIOD - /* - * Scheme is: - * use MAILHOST environment variable if present, - * else try Hesiod. - * If that fails, use the default (if any) - * provided by mts.conf in mts_init() - */ - if ((tmphost = getenv("MAILHOST")) != NULL) - pophost = tmphost; - else if ((po = hes_getmailhost(vecp ? vec[0] : user)) != NULL && - strcmp(po->po_type, "POP") == 0) - pophost = po->po_host; -# endif /* HESIOD */ /* * If "pophost" is specified in mts.conf, * use it as default value. @@ -250,8 +221,6 @@ main (int argc, char **argv) } if (!host || !*host) host = NULL; - if (!host || rpop <= 0) - setuid (uid); #endif /* POP */ if (vecp != 0) @@ -259,14 +228,13 @@ main (int argc, char **argv) #ifdef POP if (host) { - if ( strcmp( POPSERVICE, "kpop" ) == 0 ) { - kpop = 1; - } if (vecp == 0) { - status = remotemail (host, user, rpop, kpop, notifysw, 1, snoop); + status = remotemail (host, port, user, proxy, notifysw, 1, + snoop, sasl, saslmech); } else { for (vecp = 0; vec[vecp]; vecp++) - status += remotemail (host, vec[vecp], rpop, kpop, notifysw, 0, snoop); + status += remotemail (host, port, vec[vecp], proxy, notifysw, 0, + snoop, sasl, saslmech); } } else { #endif /* POP */ @@ -274,13 +242,12 @@ main (int argc, char **argv) if (vecp == 0) { char *home; - home = (uid = geteuid()) ? home = getenv ("HOME") : NULL; - if (home == NULL) { + /* 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"); - if (home == NULL) - home = pw->pw_dir; + home = pw->pw_dir; } status = checkmail (user, home, datesw, notifysw, 1); } else { @@ -295,7 +262,8 @@ main (int argc, char **argv) } /* host == NULL */ #endif - return done (status); + done (status); + return 1; } @@ -387,20 +355,21 @@ checkmail (char *user, char *home, int datesw, int notifysw, int personal) extern char response[]; static int -remotemail (char *host, char *user, int rpop, int kpop, int notifysw, int personal, int snoop) +remotemail (char *host, char *port, char *user, char *proxy, int notifysw, + int personal, int snoop, int sasl, char *saslmech) { int nmsgs, nbytes, status; char *pass = NULL; if (user == NULL) user = getusername (); - if (kpop || (rpop > 0)) + if (sasl) pass = getusername (); else ruserpass (host, &user, &pass); /* open the POP connection */ - if (pop_init (host, user, pass, snoop, kpop ? 1 : rpop, kpop) == NOTOK + 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);