From e12677b1ebaf3f07fb92a4233edc5cd0ddae55ea Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Thu, 26 Aug 2021 23:53:14 +0200 Subject: Misc POP3 cleanups. --- pop3.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pop3.c b/pop3.c index bdf2d38d..7718e201 100644 --- a/pop3.c +++ b/pop3.c @@ -132,7 +132,7 @@ static int pop3_ok (int sock, char *argbuf) bufp++; if (*bufp) - *(bufp++) = '\0'; + *(bufp++) = '\0'; if (strcmp(buf,"+OK") == 0) { @@ -377,8 +377,8 @@ static int pop3_getauth(int sock, struct query *ctl, char *greeting) #ifdef SSL_ENABLE if (must_starttls(ctl)) { /* fail with mandatory STLS without repoll */ - report(stderr, GT_("TLS is mandatory for this session, but server refused CAPA command.\n")); - report(stderr, GT_("The CAPA command is however necessary for TLS.\n")); + report(stderr, GT_("STLS is mandatory for this session, but server refused CAPA command.\n")); + report(stderr, GT_("CAPA command support is, however, necessary for STLS.\n")); return ok; } else if (maybe_starttls(ctl)) { /* defeat opportunistic STLS */ @@ -508,7 +508,7 @@ static int pop3_getauth(int sock, struct query *ctl, char *greeting) } #endif /* RPA_ENABLE */ -/* + /* * OK, we have an authentication type now. */ #if defined(KERBEROS_V4) @@ -566,6 +566,7 @@ static int pop3_getauth(int sock, struct query *ctl, char *greeting) { report(stderr, GT_("Required NTLM capability not compiled into fetchmail\n")); + return PS_AUTHFAIL; } #endif @@ -699,7 +700,7 @@ static int pop3_getauth(int sock, struct query *ctl, char *greeting) /* this is for servers which claim to support TLS, but actually * don't! */ if (connection_may_have_tls_errors - && (ok == PS_SOCKET || ok == PS_PROTOCOL)) + && (ok == PS_SOCKET || ok == PS_PROTOCOL)) { xfree(ctl->sslproto); ctl->sslproto = xstrdup(""); -- cgit v1.2.3