X2Go dev team | 11 Jan 12:20 2013

python-x2go.git - master (branch) updated: 0.2.1.1-9-g2dad379

The branch, master has been updated
       via  2dad37975a1de1ddc41c3d460dd7bfc64bd6ec87 (commit)
      from  3710451867d4f079e6324b7e37ad8c2284c5a99d (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 2dad37975a1de1ddc41c3d460dd7bfc64bd6ec87
Author: Mike Gabriel <mike.gabriel@...>
Date:   Fri Jan 11 12:22:09 2013 +0100

    ignore the session profile option display

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

Summary of changes:
 x2go/sshproxy.py |    4 ++--
 x2go/utils.py    |    8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py
index df50f2b..e06b6f5 100644
--- a/x2go/sshproxy.py
+++ b/x2go/sshproxy.py
 <at>  <at>  -289,14 +289,14  <at>  <at>  class X2goSSHProxy(paramiko.SSHClient, threading.Thread):

         """
         # hostname rewrite for localhost, force to IPv4
-        _hostname = self.hostname
+        _hostname = self.remote_host

         # 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.port)
+        (_valid, _hostname, _port, _fingerprint, _fingerprint_type) =
checkhosts.check_ssh_host_key(self, _hostname, port=self.remote_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 ab98120..421e066 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
 <at>  <at>  -205,7 +205,6  <at>  <at>  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',
 <at>  <at>  -328,6 +327,12  <at>  <at>  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',
 <at>  <at>  -336,6 +341,7  <at>  <at>  def _convert_SessionProfileOptions_2_SessionParams(options):
             'icon',
             'xinerama',
             'multidisp',
+            'display',
             'krblogin',
             'directrdp',
             'directrdpsettings',

hooks/post-receive

Gmane