From f203d73c2fb76ee6bba75c645ab4b7b7f2a9f148 Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Sun, 10 Jun 2007 22:55:36 +0000 Subject: No longer complain about invalid sslproto "" when POP3 CAPA probe fails. Fixes Debian Bug#421446 (Holger Leskien), Novell Bug #247233 (Jon Nelson). Thanks to Matthias Strauß for a configuration to reproduce the issue. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/branches/BRANCH_6-3/; revision=5109 --- pop3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pop3.c') diff --git a/pop3.c b/pop3.c index 17f66c70..9b101f03 100644 --- a/pop3.c +++ b/pop3.c @@ -449,7 +449,7 @@ static int pop3_getauth(int sock, struct query *ctl, char *greeting) 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")); return ok; - } else { + } else if (maybe_tls(ctl)) { /* defeat opportunistic STLS */ xfree(ctl->sslproto); ctl->sslproto = xstrdup(""); @@ -526,7 +526,7 @@ static int pop3_getauth(int sock, struct query *ctl, char *greeting) } } } - } + } /* maybe_tls() */ #endif /* SSL_ENABLE */ /* -- cgit v1.2.3