[X2Go-Commits] python-x2go.git - master (branch) updated: 0.4.0.8-41-g8dd9b31

X2Go dev team git-admin at x2go.org
Tue Dec 17 21:35:42 CET 2013


The branch, master has been updated
       via  8dd9b3192bb4454d0ed80fdab3530bdbf00c83cf (commit)
      from  b98840c0e699d6d9507a5274939c08019f240bb5 (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 -----------------------------------------------------------------
commit 8dd9b3192bb4454d0ed80fdab3530bdbf00c83cf
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Dec 17 21:33:37 2013 +0100

    Only use [<host>]:<port> if <port> is not 22.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                 |    1 +
 x2go/backends/control/_stdout.py |    6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 5a9cafd..d587068 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,7 @@ python-x2go (0.4.0.9-0x2go1) UNRELEASED; urgency=low
     - Fix regression: Make password logins with PyHoca-CLI succeed again.
     - Make channel compression to all authentication methods.
     - Set keepalive on proxy channel.
+    - Only use [<host>]:<port> if <port> is not 22.
   * debian/source/format:
     + Switch to format 1.0.
   * python-x2go.spec:
diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py
index bfbaf41..41b3712 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -828,7 +828,8 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient):
             # prep the fake hostname with the real hostname, so we trigger the corresponding code path in 
             # x2go.checkhosts and either of its missing host key policies
             if self.unique_hostkey_aliases:
-                _fake_hostname = "[%s]:%s" % (hostname, port)
+                if port != 22: _fake_hostname = "[%s]:%s" % (hostname, port)
+                else: _fake_hostname = hostname
 
         if look_for_keys:
             key_filename = None
@@ -861,7 +862,8 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient):
                 port = self.sshproxy_session.get_local_proxy_port()
                 _fake_hostname = self.sshproxy_session.get_remote_host()
                 _fake_port = self.sshproxy_session.get_remote_port()
-                _fake_hostname = "[%s]:%s" % (_fake_hostname, _fake_port)
+                if _fake_port != 22:
+                    _fake_hostname = "[%s]:%s" % (_fake_hostname, _fake_port)
 
             except:
                 if self.sshproxy_session:


hooks/post-receive
-- 
python-x2go.git (Python X2Go Client API)

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 "python-x2go.git" (Python X2Go Client API).




More information about the x2go-commits mailing list