diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2012-07-20 13:02:50 +0200 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2012-07-20 13:02:50 +0200 |
| commit | 8991d3b2a9f83d84b835973f1cc272d0ef0f437c (patch) | |
| tree | 97bce1085aec6fb654a679b024aba66098d32967 | |
| parent | 8c36594974268f4bb214fd790142b67fb47dd23c (diff) | |
| download | qxmpp-8991d3b2a9f83d84b835973f1cc272d0ef0f437c.tar.gz | |
fix
| -rw-r--r-- | src/base/QXmppSaslAuth.cpp | 2 | ||||
| -rw-r--r-- | src/server/QXmppIncomingClient.cpp | 2 | ||||
| -rw-r--r-- | tests/sasl.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/base/QXmppSaslAuth.cpp b/src/base/QXmppSaslAuth.cpp index 2afaf322..5fca08e3 100644 --- a/src/base/QXmppSaslAuth.cpp +++ b/src/base/QXmppSaslAuth.cpp @@ -501,7 +501,7 @@ QXmppSaslServer::Response QXmppSaslServerPlain::respond(const QByteArray &reques m_step++; response = QByteArray(); - return Succeeded; + return InputNeeded; } else { warning("QXmppSaslServerPlain : Invalid step"); return Failed; diff --git a/src/server/QXmppIncomingClient.cpp b/src/server/QXmppIncomingClient.cpp index 6a8711aa..d9a3db0c 100644 --- a/src/server/QXmppIncomingClient.cpp +++ b/src/server/QXmppIncomingClient.cpp @@ -252,7 +252,7 @@ void QXmppIncomingClient::handleStanza(const QDomElement &nodeRecv) { QByteArray challenge; QXmppSaslServer::Response response = d->saslServer->respond(QByteArray::fromBase64(nodeRecv.text().toAscii()), challenge); - if (response != QXmppSaslServer::Succeeded) { + if (response != QXmppSaslServer::InputNeeded) { sendData("<failure xmlns='urn:ietf:params:xml:ns:xmpp-sasl'><incorrect-encoding/></failure>"); disconnectFromHost(); return; diff --git a/tests/sasl.cpp b/tests/sasl.cpp index e2045266..8cddbba1 100644 --- a/tests/sasl.cpp +++ b/tests/sasl.cpp @@ -201,7 +201,7 @@ void tst_QXmppSaslServer::testPlain() // initial step returns success QByteArray response; - QCOMPARE(server->respond(QByteArray("\0foo\0bar", 8), response), QXmppSaslServer::Succeeded); + QCOMPARE(server->respond(QByteArray("\0foo\0bar", 8), response), QXmppSaslServer::InputNeeded); QCOMPARE(response, QByteArray()); QCOMPARE(server->username(), QLatin1String("foo")); QCOMPARE(server->password(), QLatin1String("bar")); |
