projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Took out parsing of military time, which was causing issues when it
[mmh]
/
uip
/
msgchk.c
diff --git
a/uip/msgchk.c
b/uip/msgchk.c
index
d91330b
..
52aedc8
100644
(file)
--- a/
uip/msgchk.c
+++ b/
uip/msgchk.c
@@
-7,7
+7,7
@@
#include <h/mh.h>
#include <zotnet/mts/mts.h>
#include <h/mh.h>
#include <zotnet/mts/mts.h>
-#include <zotnet/tws/tws.h>
+#include <h/tws.h>
#include <pwd.h>
#ifdef POP
#include <pwd.h>
#ifdef POP
@@
-42,6
+42,12
@@
# define KPOPminc(a) 0
#endif
# define KPOPminc(a) 0
#endif
+#ifndef CYRUS_SASL
+# define SASLminc(a) (a)
+#else
+# define SASLminc(a) 0
+#endif
+
static struct swit switches[] = {
#define DATESW 0
{ "date", 0 },
static struct swit switches[] = {
#define DATESW 0
{ "date", 0 },
@@
-71,6
+77,10
@@
static struct swit switches[] = {
{ "snoop", -5 },
#define KPOPSW 13
{ "kpop", KPOPminc (-4) },
{ "snoop", -5 },
#define KPOPSW 13
{ "kpop", KPOPminc (-4) },
+#define SASLSW 14
+ { "sasl", SASLminc(-4) },
+#define SASLMECHSW 15
+ { "saslmech", SASLminc(-5) },
{ NULL, 0 }
};
{ NULL, 0 }
};
@@
-101,7
+111,7
@@
static int donote (char *, int);
static int checkmail (char *, char *, int, int, int);
#ifdef POP
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 *, int, int, int, int, int, int, char *);
#endif
#endif
@@
-110,10
+120,10
@@
main (int argc, char **argv)
{
int datesw = 1, notifysw = NT_ALL;
int rpop, status = 0;
{
int datesw = 1, notifysw = NT_ALL;
int rpop, status = 0;
- int kpop = 0;
+ int kpop = 0, sasl = 0;
int snoop = 0, vecp = 0;
uid_t uid;
int snoop = 0, vecp = 0;
uid_t uid;
- char *cp, *host = NULL, *user, buf[BUFSIZ];
+ char *cp, *host = NULL, *user, buf[BUFSIZ], *saslmech = NULL;
char **argp, **arguments, *vec[MAXVEC];
struct passwd *pw;
char **argp, **arguments, *vec[MAXVEC];
struct passwd *pw;
@@
-214,6
+224,15
@@
main (int argc, char **argv)
case SNOOPSW:
snoop++;
continue;
case SNOOPSW:
snoop++;
continue;
+
+ case SASLSW:
+ sasl++;
+ continue;
+
+ case SASLMECHSW:
+ if (!(saslmech = *argp++) || *saslmech == '-')
+ adios (NULL, "missing argument to %s", argp[-2]);
+ continue;
}
}
if (vecp >= MAXVEC-1)
}
}
if (vecp >= MAXVEC-1)
@@
-263,10
+282,12
@@
main (int argc, char **argv)
kpop = 1;
}
if (vecp == 0) {
kpop = 1;
}
if (vecp == 0) {
- status = remotemail (host, user, rpop, kpop, notifysw, 1, snoop);
+ status = remotemail (host, user, rpop, kpop, notifysw, 1, snoop,
+ sasl, saslmech);
} else {
for (vecp = 0; vec[vecp]; vecp++)
} else {
for (vecp = 0; vec[vecp]; vecp++)
- status += remotemail (host, vec[vecp], rpop, kpop, notifysw, 0, snoop);
+ status += remotemail (host, vec[vecp], rpop, kpop, notifysw, 0,
+ snoop, sasl, saslmech);
}
} else {
#endif /* POP */
}
} else {
#endif /* POP */
@@
-387,20
+408,21
@@
checkmail (char *user, char *home, int datesw, int notifysw, int personal)
extern char response[];
static int
extern char response[];
static int
-remotemail (char *host, char *user, int rpop, int kpop, int notifysw, int personal, int snoop)
+remotemail (char *host, char *user, int rpop, int kpop, int notifysw, int personal, int snoop, int sasl, char *saslmech)
{
int nmsgs, nbytes, status;
char *pass = NULL;
if (user == NULL)
user = getusername ();
{
int nmsgs, nbytes, status;
char *pass = NULL;
if (user == NULL)
user = getusername ();
- if (kpop || (rpop > 0))
+ if (kpop || sasl || (rpop > 0))
pass = getusername ();
else
ruserpass (host, &user, &pass);
/* open the POP connection */
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, user, pass, snoop, kpop ? 1 : rpop, kpop,
+ sasl, saslmech) == 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);