[qmf] Default to IMAP LOGIN if server does not advertise any auth cap…

…s and LOGINDISABLED.
sailfishos · Feb 10, 2015 · 3c5cbee · 3c5cbee
1 parent 4fb106c
commit 3c5cbee
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/qmf/src/plugins/messageservices/imap/imapauthenticator.cpp b/qmf/src/plugins/messageservices/imap/imapauthenticator.cpp
@@ -99,7 +99,7 @@ static QMail::SaslMechanism authFromCapabilities(const QStringList &capabilities
     if (authCaps.contains("CRAM-MD5", Qt::CaseInsensitive) && ssoLogin.contains("CRAM-MD5")) {
         qMailLog(IMAP) << "Returning auth CRAM-MD5";
         return QMail::CramMd5Mechanism;
-    } else if (authCaps.contains("LOGIN", Qt::CaseInsensitive) && !authCaps.contains("PLAIN", Qt::CaseInsensitive)
+    } else if (!authCaps.contains("PLAIN", Qt::CaseInsensitive)
                && !capabilities.contains("LOGINDISABLED", Qt::CaseInsensitive) && ssoLogin.contains("LOGIN")) {
         qMailLog(IMAP) <<  "Returning auth LOGIN";
         // According to RFC3501, LOGIN should be used as last resort(for retro-compatibility)