[X2go-Commits] python-x2go.git - master (branch) updated: 0.2.1.1-11-gc4a24c0
X2Go dev team
git-admin at x2go.org
Sun Jan 13 00:22:22 CET 2013
The branch, master has been updated
via c4a24c0afc5ab8636f069c80c1c70c19df52d5d3 (commit)
via 61dc41b90989393423cac83e4bc7c4693f37299f (commit)
from 2dad37975a1de1ddc41c3d460dd7bfc64bd6ec87 (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 c4a24c0afc5ab8636f069c80c1c70c19df52d5d3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sun Jan 13 00:23:45 2013 +0100
ignore the session profile option display
commit 61dc41b90989393423cac83e4bc7c4693f37299f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sun Jan 13 00:22:37 2013 +0100
Revert "ignore the session profile option display"
This reverts commit 2dad37975a1de1ddc41c3d460dd7bfc64bd6ec87.
-----------------------------------------------------------------------
Summary of changes:
x2go/sshproxy.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py
index e06b6f5..df50f2b 100644
--- a/x2go/sshproxy.py
+++ b/x2go/sshproxy.py
@@ -289,14 +289,14 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread):
"""
# hostname rewrite for localhost, force to IPv4
- _hostname = self.remote_host
+ _hostname = self.hostname
# force into IPv4 for localhost connections
if _hostname in ('localhost', 'localhost.localdomain'):
_hostname = '127.0.0.1'
_valid = False
- (_valid, _hostname, _port, _fingerprint, _fingerprint_type) = checkhosts.check_ssh_host_key(self, _hostname, port=self.remote_port)
+ (_valid, _hostname, _port, _fingerprint, _fingerprint_type) = checkhosts.check_ssh_host_key(self, _hostname, port=self.port)
if not _valid and self.session_instance:
_valid = self.session_instance.HOOK_check_host_dialog(_hostname, _port, fingerprint=_fingerprint, fingerprint_type=_fingerprint_type)
return _valid
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