[qmf] Send correct smtp command when auth is not required(SmtpConfigu…

…ration::Auth_NONE)
sailfishos · Dec 18, 2013 · 586c02a · 586c02a
1 parent 9c56bca
commit 586c02a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/qmf/src/plugins/messageservices/smtp/smtpclient.cpp b/qmf/src/plugins/messageservices/smtp/smtpclient.cpp
@@ -618,8 +618,13 @@ void SmtpClient::nextAction(const QString &response)
         } else {
             if (!ssoSessionManager->waitForSso()) {
                 QByteArray authCmd(SmtpAuthenticator::getAuthentication(config.serviceConfiguration("smtp"), capabilities, ssoLogin));
-                sendCommand(authCmd);
-                status = Authenticating;
+                if (!authCmd.isEmpty()) {
+                    sendCommand(authCmd);
+                    status = Authenticating;
+                } else {
+                    status = Authenticated;
+                    nextAction(QString());
+                }
             } else {
                 sendLogin = true;
             }
@@ -1113,8 +1118,13 @@ void SmtpClient::onSsoSessionResponse(const QList<QByteArray> &ssoCredentials)
         if (sendLogin) {
             sendLogin = false;
             QByteArray authCmd(SmtpAuthenticator::getAuthentication(config.serviceConfiguration("smtp"), capabilities, ssoLogin));
-            sendCommand(authCmd);
-            status = Authenticating;
+            if (!authCmd.isEmpty()) {
+                sendCommand(authCmd);
+                status = Authenticating;
+            } else {
+                status = Authenticated;
+                nextAction(QString());
+            }
         }
     }
 }

diff --git a/rpm/qmf-qt5.spec b/rpm/qmf-qt5.spec
@@ -1,6 +1,6 @@
 Name: qmf-qt5
 Summary:    Qt Messaging Framework (QMF) Qt5
-Version:    4.0.4
+Version:    4.0.4+git2
 Release:    1
 Group:      System/Libraries
 License:    LGPLv2.1 with exception or GPLv3