move towards server workflow

3 files changed, 4 insertions, 4 deletions

diff --git a/src/base/QXmppSaslAuth.cpp b/src/base/QXmppSaslAuth.cpp
index 19ac9066..2afaf322 100644
--- a/src/base/QXmppSaslAuth.cpp
+++ b/src/base/QXmppSaslAuth.cpp
@@ -442,9 +442,9 @@ QXmppSaslServer::Response QXmppSaslServerDigestMd5::respond(const QByteArray &re
         const QByteArray realm = input.value("realm");
 
         setUsername(QString::fromUtf8(input.value("username")));
-        qDebug("username: %s", qPrintable(username()));
+        if (password().isEmpty())
+            return InputNeeded;
 
-        //m_saslDigest.setSecret(reply->digest());
         m_saslDigest.setQop("auth");
         m_saslDigest.setDigestUri(input.value("digest-uri"));
         m_saslDigest.setNc(input.value("nc"));
diff --git a/src/base/QXmppSaslAuth.h b/src/base/QXmppSaslAuth.h
index b7e95ee7..b332e73b 100644
--- a/src/base/QXmppSaslAuth.h
+++ b/src/base/QXmppSaslAuth.h
@@ -112,7 +112,8 @@ public:
     enum Response {
         Challenge = 0,
         Succeeded = 1,
-        Failed = 2
+        Failed = 2,
+        InputNeeded = 3
     };
 
     QXmppSaslServer(QObject *parent = 0);
diff --git a/src/server/QXmppIncomingClient.cpp b/src/server/QXmppIncomingClient.cpp
index 26a67045..6a8711aa 100644
--- a/src/server/QXmppIncomingClient.cpp
+++ b/src/server/QXmppIncomingClient.cpp
@@ -253,7 +253,6 @@ void QXmppIncomingClient::handleStanza(const QDomElement &nodeRecv)
                 QByteArray challenge;
                 QXmppSaslServer::Response response = d->saslServer->respond(QByteArray::fromBase64(nodeRecv.text().toAscii()), challenge);
                 if (response != QXmppSaslServer::Succeeded) {
-
                     sendData("<failure xmlns='urn:ietf:params:xml:ns:xmpp-sasl'><incorrect-encoding/></failure>");
                     disconnectFromHost();
                     return;