[X2Go-Commits] x2goclient.git - build-baikal (branch) updated: 4.0.1.0-2-gfeef505

[X2Go dev team]

The branch, build-baikal has been updated
       via  feef5058b44f1dba45c8cd79bb6b687317284f36 (commit)
      from  085568ae95cb3eaa5e9ec26723edb800eb4f132e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog        |    4 ++++
 sshmasterconnection.cpp |    6 +-----
 2 files changed, 5 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 4b82401..067b4a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low
 
+  [ Mike Gabriel ]
   * Continue development...
 
+  [ Oleksandr Shneyder ]
+  * Use "127.0.0.1" instead of localhost to avoid wrong IPv6 hostname resolution
+
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 22 Mar 2013 23:21:11 +0100
 
 x2goclient (4.0.1.0-0~x2go1) unstable; urgency=low
diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp
index 0db4077..196cec0 100644
--- a/sshmasterconnection.cpp
+++ b/sshmasterconnection.cpp
@@ -155,7 +155,7 @@ void SshMasterConnection::slotSshProxyConnectionOk()
     while ( ONMainWindow::isServerRunning ( localProxyPort ) )
         ++localProxyPort;
 
-    sshProxy->startTunnel ( host, port, "localhost",localProxyPort,false,this, SLOT ( slotSshProxyTunnelOk(int)),
+    sshProxy->startTunnel ( host, port, "127.0.0.1",localProxyPort,false,this, SLOT ( slotSshProxyTunnelOk(int)),
                             SLOT ( slotSshProxyTunnelFailed(bool,QString,int)));
 
 }
@@ -574,11 +574,7 @@ bool SshMasterConnection::sshConnect()
     QByteArray tmpBA = host.toLocal8Bit();
     if(useproxy && proxytype==PROXYSSH)
     {
-#ifdef Q_OS_WIN
         ssh_options_set ( my_ssh_session, SSH_OPTIONS_HOST, "127.0.0.1" );
-#else
-        ssh_options_set ( my_ssh_session, SSH_OPTIONS_HOST, "localhost" );
-#endif
         ssh_options_set ( my_ssh_session, SSH_OPTIONS_PORT, &localProxyPort );
 
     }


hooks/post-receive
-- 
x2goclient.git (X2Go Client)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goclient.git" (X2Go Client).