[X2Go-Commits] python-x2go.git - brokerclient (branch) updated: 0.2.0.10-3-ga180527

X2Go dev team git-admin at x2go.org
Tue Jan 7 16:21:24 CET 2014


The branch, brokerclient has been updated
       via  a1805270345b3eebe19a2d99cd78d1a24b351d55 (commit)
      from  38373f3f05f4b34858f236f48c23e56b370112b8 (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:
 debian/changelog |    8 ++++++++
 x2go/defaults.py |    3 ++-
 x2go/sshproxy.py |    5 +++--
 x2go/utils.py    |    4 ++++
 4 files changed, 17 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index f82a5fd..7ff9cad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+python-x2go (0.2.0.10-0~x2go3) UNRELEASED; urgency=low
+
+  * New upstream version (0.2.0.11):
+    - Prepare for staying compatible with new SSH proxy feature
+      in X2Go Client.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 26 Sep 2012 20:49:44 +0200
+
 python-x2go (0.2.0.10-0~x2go2) unstable; urgency=low
 
   * /debian/control:
diff --git a/x2go/defaults.py b/x2go/defaults.py
index a9562bf..77c996c 100644
--- a/x2go/defaults.py
+++ b/x2go/defaults.py
@@ -295,7 +295,8 @@ X2GO_SESSIONPROFILE_DEFAULTS = {
     'autologin': False, 'autostart': False, 'setsessiontitle': False, 'sessiontitle': "",
     'speed': 2, 'pack': '16m-jpeg', 'quality': 9,
     'iconvto': 'UTF-8', 'iconvfrom': 'UTF-8', 'useiconv': False,
-    'usesshproxy': False, 'sshproxyhost': '', 'sshproxyuser': '', 'sshproxytunnel': '', 'sshproxykeyfile': '',
+    'usesshproxy': False, 'sshproxyhost': '', 'sshproxyport': 22, 'sshproxyuser': '', 'sshproxytunnel': '', 'sshproxykeyfile': '',
+    'sshproxytype': 'SSH', 'sshproxysameuser': False, 'sshproxysamepass': False, 'sshproxyautologin'; False,
     'useexports': True, 'fstunnel': True, 'export': '',
     'usemimebox': False, 'mimeboxextensions': '', 'mimeboxaction': 'OPEN',
     'fullscreen': False,
diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py
index 5cecf17..f595388 100644
--- a/x2go/sshproxy.py
+++ b/x2go/sshproxy.py
@@ -93,9 +93,9 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread):
         @type hostname: C{str}
         @param port: alias for C{local_port}
         @type port: C{int}
-        @param sshproxy_host: alias for C{remote_host}
+        @param sshproxy_host: alias for C{hostname}
         @type sshproxy_host: C{str}
-        @param sshproxy_port: alias for C{remote_port}
+        @param sshproxy_port: alias for C{post}
         @type sshproxy_port: C{int}
         @param sshproxy_user: alias for C{username}
         @type sshproxy_user: C{str}
@@ -141,6 +141,7 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread):
             else:
                 self.hostname = sshproxy_host
 
+        if sshproxy_port: self.port = sshproxy_port
         if sshproxy_user: self.username = sshproxy_user
         if sshproxy_password: password = sshproxy_password
         if sshproxy_key_filename: key_filename = sshproxy_key_filename
diff --git a/x2go/utils.py b/x2go/utils.py
index 9dc38c4..189e875 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -200,6 +200,7 @@ def _convert_SessionProfileOptions_2_SessionParams(options):
             'iconvfrom': 'client_encoding',
             'usesshproxy': 'use_sshproxy',
             'sshproxyhost': 'sshproxy_host',
+            'sshproxyport': 'sshproxy_port',
             'sshproxyuser': 'sshproxy_user',
             'sshproxykeyfile': 'sshproxy_key_filename',
             'sshproxytunnel': 'sshproxy_tunnel',
@@ -319,6 +320,9 @@ def _convert_SessionProfileOptions_2_SessionParams(options):
             'directrdpsettings',
             'rdpclient',
             'rdpport',
+            'sshproxytype',
+            'sshproxysameuser',
+            'sshproxysamepass',
     ]
     for i in _ignored_options:
         del _params[i]


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