[X2Go-Commits] [x2goclient] 01/01: src/sshmasterconnection.cpp: for proxied connections, fetch the user name matching the given host, not proxy host.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit dd9c9f405cd04e0c90cdc31e82608d247805a8fe
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Oct 12 00:43:54 2017 +0200

    src/sshmasterconnection.cpp: for proxied connections, fetch the user name matching the given host, not proxy host.
---
 debian/changelog            | 2 ++
 src/sshmasterconnection.cpp | 7 +------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b8ae206..aac1dea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -215,6 +215,8 @@ x2goclient (4.1.1.0-0x2go1) UNRELEASED; urgency=medium
       file and re-add numerus form translation.
     - res/i18n/x2goclient_nb_no.ts: various fixups for Bokmål (Norway)
       translation file, including numerus form.
+    - src/sshmasterconnection.cpp: for proxied connections, fetch the user
+      name matching the given host, not proxy host.
   * x2goclient.spec:
     - Respect %{optflags} and pass QMAKE_STRIP=: to fix missing debug info
       issues.
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index c0360b8..34ac8a2 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -210,12 +210,7 @@ SshMasterConnection::SshMasterConnection (QObject* parent, QString host, int por
         else {
             QByteArray tmp_BA;
 
-            if ((useproxy) && (PROXYSSH == proxytype)) {
-                tmp_BA = this->proxyserver.toLocal8Bit ();
-            }
-            else {
-                tmp_BA = this->host.toLocal8Bit ();
-            }
+            tmp_BA = this->host.toLocal8Bit ();
 
             ssh_options_set (tmp_session, SSH_OPTIONS_HOST, tmp_BA.data ());
 

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git