aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Andree <matthias.andree@gmx.de>2005-03-19 13:34:50 +0000
committerMatthias Andree <matthias.andree@gmx.de>2005-03-19 13:34:50 +0000
commitfd09cd02614a0c49c27fd6a6b73e5087e776a428 (patch)
treeff0a46d681c6907fa3c9eb5b466e88bdac1a265e
parent5b1232a2a49376835d62bc0b5a7b9f3c3c5340c9 (diff)
downloadfetchmail-fd09cd02614a0c49c27fd6a6b73e5087e776a428.tar.gz
fetchmail-fd09cd02614a0c49c27fd6a6b73e5087e776a428.tar.bz2
fetchmail-fd09cd02614a0c49c27fd6a6b73e5087e776a428.zip
Revised "POP3 strong authentication fixes." that esr put into release 3873
on 2004-01-13 07:02:39Z, it would loop infinitely when CAPA failed. Reported by David Greaves. svn path=/trunk/; revision=4027
-rw-r--r--NEWS3
-rw-r--r--pop3.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 008a7338..0c49d585 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,9 @@
* Include James Stone's moldremover.py script.
* Enable .fetchmailrc permissions checking under Cygwin.
* Nalin Dahyabai's fix for POP3 strong authentication.
+* Revised Nalin Dahyabai's fix for POP3 strong authentication (Matthias
+ Andree, the original version would go into an infinite loop when CAPA
+ failed; found by David Greaves.)
* HOME_ETC patch for PLD Linux.
* Sunil Shetye's fix for SSL configuration.
* Simon Josefsson's patch for GSS library support.
diff --git a/pop3.c b/pop3.c
index 8ee3686e..f766d198 100644
--- a/pop3.c
+++ b/pop3.c
@@ -361,8 +361,7 @@ static int pop3_getauth(int sock, struct query *ctl, char *greeting)
* These authentication methods are blessed by RFC1734,
* describing the POP3 AUTHentication command.
*/
- if ((ctl->use_ssl != FLAG_FALSE) ||
- (ctl->server.authenticate == A_ANY) ||
+ if ((ctl->server.authenticate == A_ANY) ||
(ctl->server.authenticate == A_GSSAPI) ||
(ctl->server.authenticate == A_KERBEROS_V4) ||
(ctl->server.authenticate == A_OTP) ||