From: Kevin McCarthy <kevin@8t8.us>
Date: Fri, 29 Mar 2019 22:21:02 +0000 (-0700)
Subject: Change IMAP to try oauthbearer first
X-Git-Tag: 2019-10-25~276^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=119f7d8044732a400a2e69247dd7de3dc7ffbc53;p=neomutt

Change IMAP to try oauthbearer first

$imap_authenticators says if it is unset, the authenticators from
most-secure to secure will be tried.  It makes sense for oauthbearer
to come first, like with POP.

To make this change backwards compatible, it depends on the previous
commit, which changed imap_auth_oauth() to return IMAP_AUTH_UNAVAIL if
oauth is not configured or explictily requested.

Co-authored-by: Richard Russon <rich@flatcap.org>
---

diff --git a/imap/auth.c b/imap/auth.c
index 7fe279844..3d5d1eed7 100644
--- a/imap/auth.c
+++ b/imap/auth.c
@@ -40,7 +40,7 @@ char *C_ImapAuthenticators; ///< Config: (imap) List of allowed IMAP authenticat
  * imap_authenticators - Accepted authentication methods
  */
 static const struct ImapAuth imap_authenticators[] = {
-  { imap_auth_plain, "plain" },
+  { imap_auth_oauth, "oauthbearer" }, { imap_auth_plain, "plain" },
 #ifdef USE_SASL
   { imap_auth_sasl, NULL },
 #else
@@ -53,7 +53,7 @@ static const struct ImapAuth imap_authenticators[] = {
 #ifndef USE_SASL
   { imap_auth_cram_md5, "cram-md5" },
 #endif
-  { imap_auth_login, "login" },       { imap_auth_oauth, "oauthbearer" },
+  { imap_auth_login, "login" },
 };
 
 /**