X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=pop2.c;h=03d58a18f92334be44b0c57bd5774e1cf6893d18;hb=03a31a4771efd7e48256ac0d7d2442f5e6bc381f;hp=3be6fcd2365ca4b1e580fb5815fff943cd164710;hpb=c5cf37a81f295113478aa9271cef6f43bb9e7f15;p=~andy%2Ffetchmail diff --git a/pop2.c b/pop2.c index 3be6fcd2..03d58a18 100644 --- a/pop2.c +++ b/pop2.c @@ -61,11 +61,19 @@ static int pop2_getauth(int sock, struct query *ctl, char *buf) int status; (void)buf; + if (ctl->sslproto && !strcasecmp(ctl->sslproto, "tls1") && !ctl->use_ssl) { report(stderr, GT_("POP2 does not support STLS. Giving up.\n")); return PS_SOCKET; } + + if (ctl->server.authenticate != A_ANY && ctl->server.authenticate != A_PASSWORD) + { + report(stderr, GT_("POP2 only supports password authentication. Giving up.\n")); + return PS_AUTHFAIL; + } + strlcpy(shroud, ctl->password, sizeof(shroud)); status = gen_transact(sock, "HELO %s %s",