From abe5829f32554045a77aa501b6ef60f2d1e07dc3 Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Tue, 17 Mar 1998 18:10:43 +0000 Subject: Get copmpatible with Cyrus again. svn path=/trunk/; revision=1706 --- NEWS | 3 ++- imap.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 30f3ed85..278e730c 100644 --- a/NEWS +++ b/NEWS @@ -24,8 +24,9 @@ fetchmail-4.4.0 (Mon Mar 16 14:57:38 EST 1998): * Allow spaces in IMAP usernames (thank Juerg Wanner ). * Handle empty Return-Path (thank Dmitry Yaitskov ). * Improvements in UID handling; should be a cleaner fix for Dick van den Burg. +* Remove the LOGIN capability check for IMAPrev1 servers; Cyrus chokes on it. -There are 272 people on fetchmail-friends and 160 on fetchmail-announce. +There are 273 people on fetchmail-friends and 160 on fetchmail-announce. fetchmail-4.3.9 (Fri Mar 6 10:45:32 EST 1998): * Relax the LOGIN capability check in IMAP. diff --git a/imap.c b/imap.c index b1f27e1c..69920480 100644 --- a/imap.c +++ b/imap.c @@ -676,11 +676,13 @@ int imap_getauth(int sock, struct query *ctl, char *greeting) } #endif /* KERBEROS_V4 */ +#ifdef __UNUSED__ /* The Cyrus IMAP4rev1 server chokes on this */ /* 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; }; +#endif /* __UNUSED__ */ /* try to get authorized in the ordinary (AUTH=LOGIN) way */ { -- cgit v1.2.3