X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmsgchk.c;h=3654995b381516df80e5b3e535d2480fe6a563d4;hb=8e79ce1919d9cf54f101a812e0fd70a33286b9f3;hp=3b9bc74fd6405bf39d3a0270af00357e06fb0ad9;hpb=6c42153ad9362cc676ea66563bf400d7511b3b68;p=mmh diff --git a/uip/msgchk.c b/uip/msgchk.c index 3b9bc74..3654995 100644 --- a/uip/msgchk.c +++ b/uip/msgchk.c @@ -2,8 +2,6 @@ /* * 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. @@ -14,37 +12,7 @@ #include #include -#ifdef POP -# include -#endif - -#ifdef HESIOD -# include -#endif - -#ifndef POP -# define POPminc(a) (a) -#else -# define POPminc(a) 0 -#endif - -#ifndef RPOP -# define RPOPminc(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 -#endif +#include #ifndef CYRUS_SASL # define SASLminc(a) (a) @@ -62,29 +30,23 @@ static struct swit switches[] = { #define NNOTESW 3 { "nonotify type", 0 }, #define HOSTSW 4 - { "host hostname", POPminc (-4) }, + { "host hostname", 0 }, #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 + { "user username", 0 }, +#define PORTSW 6 + { "port name/number", 0 }, +#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 14 +#define SASLSW 10 { "sasl", SASLminc(-4) }, -#define SASLMECHSW 15 +#define SASLMECHSW 11 { "saslmech", SASLminc(-5) }, +#define PROXYSW 12 + { "proxy command", 0 }, { NULL, 0 } }; @@ -95,6 +57,8 @@ static struct swit switches[] = { #define MAXVEC 51 #define NT_NONE 0x0 +#ifdef NT_NONE +#endif /* Use NT_NONE to prevent warning from gcc -Wunused-macros. */ #define NT_MAIL 0x1 #define NT_NMAI 0x2 #define NT_ALL (NT_MAIL | NT_NMAI) @@ -113,29 +77,21 @@ static struct swit switches[] = { */ 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, int, char *); -#endif +static int remotemail (char *, char *, char *, char *, int, int, int, int, + char *); int main (int argc, char **argv) { int datesw = 1, notifysw = NT_ALL; - int rpop, status = 0; - int kpop = 0, sasl = 0; + int status = 0, sasl = 0; int snoop = 0, vecp = 0; - uid_t uid; - char *cp, *host = NULL, *user, buf[BUFSIZ], *saslmech = NULL; + char *cp, *host = NULL, *port = NULL, *user, *proxy = NULL; + char buf[BUFSIZ], *saslmech = NULL; char **argp, **arguments, *vec[MAXVEC]; struct passwd *pw; -#ifdef HESIOD - struct hes_postoffice *po; - char *tmphost; -#endif - #ifdef LOCALE setlocale(LC_ALL, ""); #endif @@ -145,19 +101,11 @@ main (int argc, char **argv) context_read(); mts_init (invo_name); - uid = getuid (); user = getusername(); arguments = getarguments (invo_name, argc, argv, 1); argp = arguments; -#ifdef POP - if ((cp = getenv ("MHPOPDEBUG")) && *cp) - snoop++; -#endif - - rpop = 0; - while ((cp = *argp++)) { if (*cp == '-') { switch (smatch (++cp, switches)) { @@ -171,10 +119,10 @@ main (int argc, char **argv) snprintf (buf, sizeof(buf), "%s [switches] [users ...]", invo_name); print_help (buf, switches, 1); - done (1); + done (0); case VERSIONSW: print_version(invo_name); - done (1); + done (0); case DATESW: datesw++; @@ -198,6 +146,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]); @@ -207,24 +161,6 @@ main (int argc, char **argv) vec[vecp++] = cp; continue; - case APOPSW: - rpop = -1; - continue; - case NAPOPSW: - rpop = 0; - continue; - - case RPOPSW: - rpop = 1; - continue; - case NRPOPSW: - rpop = 0; - continue; - - case KPOPSW: - kpop = 1; - continue; - case SNOOPSW: snoop++; continue; @@ -237,6 +173,11 @@ main (int argc, char **argv) if (!(saslmech = *argp++) || *saslmech == '-') adios (NULL, "missing argument to %s", argp[-2]); continue; + + case PROXYSW: + if (!(proxy = *argp++) || *proxy == '-') + adios (NULL, "missing argument to %s", argp[-2]); + continue; } } if (vecp >= MAXVEC-1) @@ -245,25 +186,10 @@ main (int argc, char **argv) vec[vecp++] = cp; } -#ifdef POP /* * 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. @@ -273,39 +199,30 @@ main (int argc, char **argv) } if (!host || !*host) host = NULL; - if (!host || rpop <= 0) - setuid (uid); -#endif /* POP */ if (vecp != 0) vec[vecp] = NULL; -#ifdef POP if (host) { - if ( strcmp( POPSERVICE, "kpop" ) == 0 ) { - kpop = 1; - } if (vecp == 0) { - status = remotemail (host, user, rpop, kpop, notifysw, 1, snoop, - sasl, saslmech); + 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, + status += remotemail (host, port, vec[vecp], proxy, notifysw, 0, snoop, sasl, saslmech); } } else { -#endif /* POP */ 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 { @@ -316,11 +233,10 @@ main (int argc, char **argv) advise (NULL, "no such user as %s", vec[vecp]); } } -#ifdef POP } /* host == NULL */ -#endif - return done (status); + done (status); + return 1; } @@ -408,25 +324,24 @@ checkmail (char *user, char *home, int datesw, int notifysw, int personal) } -#ifdef POP extern char response[]; static int -remotemail (char *host, char *user, int rpop, int kpop, int notifysw, int personal, int snoop, int sasl, char *saslmech) +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 || sasl || (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, - sasl, saslmech) == 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); @@ -456,4 +371,3 @@ remotemail (char *host, char *user, int rpop, int kpop, int notifysw, int person return status; } -#endif /* POP */