From e183eaf9d383fdf31c4949c864e5e8cfb8c347ce Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Mon, 3 Sep 2012 13:54:02 +0200
Subject: don't send non-SASL auth if disabled

---
 src/client/QXmppOutgoingClient.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/client/QXmppOutgoingClient.cpp')

diff --git a/src/client/QXmppOutgoingClient.cpp b/src/client/QXmppOutgoingClient.cpp
index 370cd2aa..b7241b04 100644
--- a/src/client/QXmppOutgoingClient.cpp
+++ b/src/client/QXmppOutgoingClient.cpp
@@ -295,9 +295,10 @@ void QXmppOutgoingClient::handleStream(const QDomElement &streamElement)
         d->streamVersion = streamElement.attribute("version");
 
         // no version specified, signals XMPP Version < 1.0.
-        // switch to old auth mechanism
-        if(d->streamVersion.isEmpty())
+        // switch to old auth mechanism if enabled
+        if(d->streamVersion.isEmpty() && configuration().useNonSASLAuthentication()) {
             sendNonSASLAuthQuery();
+        }
     }
 }
 
-- 
cgit v1.2.3