From b83586db0d2e260d4730e4bf3e91c4275b82845f Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Fri, 3 Aug 2012 12:40:44 +0200
Subject: revert to use the domain for SASL auth

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

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

diff --git a/src/client/QXmppOutgoingClient.cpp b/src/client/QXmppOutgoingClient.cpp
index 1d8b4f60..c3bcd8d0 100644
--- a/src/client/QXmppOutgoingClient.cpp
+++ b/src/client/QXmppOutgoingClient.cpp
@@ -67,8 +67,6 @@ public:
 
     // DNS
     QDnsLookup dns;
-    QString usedHost;
-    quint16 usedPort;
 
     // Stream
     QString streamId;
@@ -111,10 +109,8 @@ void QXmppOutgoingClientPrivate::connectToHost(const QString &host, quint16 port
     // respect proxy
     q->socket()->setProxy(config.networkProxy());
 
-    // connect to host and make a note of used host/port
+    // connect to host
     q->socket()->connectToHost(host, port);
-    usedHost = host;
-    usedPort = port;
 }
 
 /// Constructs an outgoing client stream.
@@ -373,7 +369,7 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv)
                 return;
             }
             info(QString("SASL mechanism '%1' selected").arg(d->saslClient->mechanism()));
-            d->saslClient->setHost(d->usedHost);
+            d->saslClient->setHost(d->config.domain());
             d->saslClient->setServiceType("xmpp");
             if (d->saslClient->mechanism() == "X-FACEBOOK-PLATFORM") {
                 d->saslClient->setUsername(configuration().facebookAppId());
-- 
cgit v1.2.3