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 --- NEWS | 5 ++++- TODO.txt | 3 --- pop3.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/NEWS b/NEWS index 7cb24633..cfaaeea7 100644 --- a/NEWS +++ b/NEWS @@ -42,7 +42,7 @@ be removed from a 6.4.0 or newer release.) -------------------------------------------------------------------------------- -fetchmail 6.3.X (not yet released, may become .8.1 or .9): +fetchmail 6.3.9 (not yet released): # FIXES: * The configure script will additionally check for 'dn_skipname', to fix build @@ -52,6 +52,9 @@ fetchmail 6.3.X (not yet released, may become .8.1 or .9): NOTE: this is a bit of a hack, since we twist the HAVE_RES_SEARCH result, but res_search() and dn_skipname() are only used together and scheduled for removal in future versions, so this is probably fine. +* 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. # TRANSLATION UPDATES: * Polish (Jakub Bogusz) diff --git a/TODO.txt b/TODO.txt index e92c6e52..2cc1e3ee 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,9 +1,6 @@ soon: - find a solution for the "invalid header" discards message problem (escape headers and stuff reminder into body) -- https://bugzilla.novell.com/show_bug.cgi?id=247233 - (same as http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=421446) - might be our fallback of setting sslproto to ""? But what triggers it? 6.4: - make the SSL default v3 (rather than v23). 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