X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Finc.c;h=8716edd8e1f14acbc11425a6549b929537a459de;hb=7fd676d57355fd26c1127a79d9ba805973928316;hp=2f7001ee0daa3b820c6e0bd884fb312becb471b8;hpb=2726ac85e14391c3d78c79816eff959c560c986b;p=mmh diff --git a/uip/inc.c b/uip/inc.c index 2f7001e..8716edd 100644 --- a/uip/inc.c +++ b/uip/inc.c @@ -89,9 +89,11 @@ static struct swit switches[] = { { "snoop", -5 }, #define SASLSW 20 { "sasl", SASLminc(-4) }, -#define SASLMECHSW 21 +#define NOSASLSW 21 + { "nosasl", SASLminc(-6) }, +#define SASLMECHSW 22 { "saslmech", SASLminc(-8) }, -#define PROXYSW 22 +#define PROXYSW 23 { "proxy command", 0 }, { NULL, 0 } }; @@ -202,7 +204,7 @@ main (int argc, char **argv) struct msgs *mp = NULL; struct stat st, s1; FILE *aud = NULL; - char b[MAXPATHLEN + 1]; + char b[PATH_MAX + 1]; char *maildir_copy = NULL; /* copy of mail directory because the static gets overwritten */ int nmsgs, nbytes; @@ -335,7 +337,7 @@ main (int argc, char **argv) continue; case PORTSW: - if (!(host = *argp++) || *port == '-') + if (!(port = *argp++) || *port == '-') adios (NULL, "missing argument to %s", argp[-2]); continue; @@ -359,6 +361,9 @@ main (int argc, char **argv) case SASLSW: sasl++; continue; + case NOSASLSW: + sasl = 0; + continue; case SASLMECHSW: if (!(saslmech = *argp++) || *saslmech == '-')