If a method list has been given, fall back to the next authenticator

whenever an attempt returns NO or BAD.

diff --git a/imap/auth_sasl.c b/imap/auth_sasl.c
index 38a801a900201f0ea794ff6dc9528aa4b12bfe69..99ea3edef220ab6ca604f61313101b057b8ceb4a 100644 (file)
--- a/imap/auth_sasl.c
+++ b/imap/auth_sasl.c
@@ -118,13 +118,6 @@ imap_auth_res_t imap_auth_sasl (IMAP_DATA* idata, const char* method)
       irc = imap_cmd_step (idata);
     while (irc == IMAP_CMD_CONTINUE);
 
-    if (method && irc == IMAP_CMD_NO)
-    {
-      dprint (2, (debugfile, "imap_auth_sasl: %s failed\n", method));
-      sasl_dispose (&saslconn);
-      return IMAP_AUTH_UNAVAIL;
-    }
-
     if (irc == IMAP_CMD_BAD || irc == IMAP_CMD_NO)
       goto bail;
 
@@ -200,9 +193,16 @@ imap_auth_res_t imap_auth_sasl (IMAP_DATA* idata, const char* method)
   }
 
  bail:
+  sasl_dispose (&saslconn);
+
+  if (method)
+  {
+    dprint (2, (debugfile, "imap_auth_sasl: %s failed\n", method));
+    return IMAP_AUTH_UNAVAIL;
+  }
+
   mutt_error _("SASL authentication failed.");
   mutt_sleep(2);
-  sasl_dispose (&saslconn);
 
   return IMAP_AUTH_FAILURE;
 }