[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.2.1.1-10-g61dc41b
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:29:34 CET 2014
The branch, build-baikal has been updated
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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
x2go/sshproxy.py | 4 ++--
x2go/utils.py | 8 +-------
2 files changed, 3 insertions(+), 9 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
diff --git a/x2go/utils.py b/x2go/utils.py
index 421e066..ab98120 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -205,6 +205,7 @@ def _convert_SessionProfileOptions_2_SessionParams(options):
'sshproxyport': 'sshproxy_port',
'sshproxyuser': 'sshproxy_user',
'sshproxykeyfile': 'sshproxy_key_filename',
+ 'sshproxytunnel': 'sshproxy_tunnel',
'sessiontitle': 'session_title',
'setsessiontitle': 'set_session_title',
'published': 'published_applications',
@@ -327,12 +328,6 @@ def _convert_SessionProfileOptions_2_SessionParams(options):
_params['sshproxy_key_filename'] = _params['key_filename']
del _params['sshproxysamepass']
- if options['sshproxytunnel']:
- del _params['sshproxytunnel']
-
- if _params['use_sshproxy']:
- _params['sshproxy_tunnel'] = 'localhost:44444:%s:%s' % (_params['server'], _params['port'])
-
# currently known but ignored in Python X2go
_ignored_options = [
'startsoundsystem',
@@ -341,7 +336,6 @@ def _convert_SessionProfileOptions_2_SessionParams(options):
'icon',
'xinerama',
'multidisp',
- 'display',
'krblogin',
'directrdp',
'directrdpsettings',
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