From: Steve Holme <steve_holme@hotmail.com>
Date: Tue, 24 Dec 2013 22:45:25 +0000 (+0000)
Subject: imap: Fixed auth preference not being honored when CAPABILITY not supported
X-Git-Tag: curl-7_35_0~182
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7fd490732acdccc2c0f490a31a3828fa7a284f63;p=thirdparty%2Fcurl.git

imap: Fixed auth preference not being honored when CAPABILITY not supported

If a user indicated they preferred to authenticate using a SASL
mechanism, but SASL authentication wasn't supported by the server, curl
would always fall back to clear text when CAPABILITY wasn't supported,
even though the user didn't want to use this.
---

diff --git a/lib/imap.c b/lib/imap.c
index e4185a3a15..3f881ee0ec 100644
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -917,7 +917,7 @@ static CURLcode imap_state_capability_resp(struct connectdata *conn,
       result = imap_perform_authentication(conn);
   }
   else
-    result = imap_perform_login(conn);
+    result = imap_perform_authentication(conn);
 
   return result;
 }