Relax the LOGIN capability test.

svn path=/trunk/; revision=1679

diff --git a/NEWS b/NEWS
index 5fb9882207af0392ddadd7aba607f3053caf342f..83bc3611e9c416f83c12a4079fb71bbdc74fb1b4 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,9 @@
                                Release Notes:
 
 ------------------------------------------------------------------------------
+fetchmail-4.4.0 ():
+* Relax the LOGIN capability check in IMAP.
+
 fetchmail-4.3.8 (Tue Feb 24 15:47:13 EST 1998):
 * Documentation cleanup.
 * -S is back to setting smtphost all the time; net-security option is now -T.

diff --git a/imap.c b/imap.c
index af605789fea91c79df4e0e495645ab87fdc34cd0..66f42c8a0d1d85a721b29a9333b424bae2235842 100644 (file)
--- a/imap.c
+++ b/imap.c
@@ -648,7 +648,8 @@ int imap_getauth(int sock, struct query *ctl, char *greeting)
     }
 #endif /* KERBEROS_V4 */
 
-    if ((imap_version >= IMAP4rev1) && (!strstr(capabilities, "AUTH=LOGIN"))) {
+    /* this handles either AUTH=LOGIN or AUTH-LOGIN */
+    if ((imap_version >= IMAP4rev1) && (!strstr(capabilities, "LOGIN"))) {
       error(0,-1, "Required LOGIN capability not supported by server");
       return PS_AUTHFAIL;
     };