[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.2.0.10-7-gb08887f
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:31:15 CET 2014
The branch, build-baikal has been updated
via b08887f153ce00d3501b0992ba4e37a332d8af72 (commit)
from 80bec3b0f51d6abcfee150bf932701dfdd368586 (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 | 1 +
x2go/backends/control/_stdout.py | 8 +++++---
x2go/session.py | 2 +-
x2go/utils.py | 1 +
4 files changed, 8 insertions(+), 4 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index d783dfb..8e2d929 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ python-x2go (0.2.0.11-0~x2go1) UNRELEASED; urgency=low
* New upstream version (0.2.0.11):
- Prepare for staying compatible with new SSH proxy feature
in X2Go Client.
+ - Add sshproxy_port option to session (SSH proxy) options.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Wed, 26 Sep 2012 20:49:44 +0200
diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py
index 108d6ef..18458bd 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -605,7 +605,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
return checkhosts.check_ssh_host_key(self, hostname, port=port)
def connect(self, hostname, port=22, username='', password='', pkey=None,
- use_sshproxy=False, sshproxy_host='', sshproxy_user='', sshproxy_password='',
+ use_sshproxy=False, sshproxy_host='', sshproxy_port=22, sshproxy_user='', sshproxy_password='',
sshproxy_key_filename='', sshproxy_tunnel='',
key_filename=None, timeout=None, allow_agent=False, look_for_keys=False,
session_instance=None,
@@ -667,9 +667,10 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
@type session_instance: C{obj}
@param use_sshproxy: connect through an SSH proxy
@type use_sshproxy: C{True} if an SSH proxy is to be used for tunneling the connection
- @param sshproxy_host: hostname of the SSH proxy server, use <hostname>:<port> to name a
- non-standard SSH port
+ @param sshproxy_host: hostname of the SSH proxy server
@type sshproxy_host: C{str}
+ @param sshproxy_port: port of the SSH proxy server
+ @type sshproxy_port: C{int}
@param sshproxy_user: username that we use for authenticating against C{<sshproxy_host>}
@type sshproxy_user: C{str}
@param sshproxy_password: a password to use for SSH proxy authentication or for unlocking
@@ -698,6 +699,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
try:
self.sshproxy_session = sshproxy.X2goSSHProxy(known_hosts=self.known_hosts,
sshproxy_host=sshproxy_host,
+ sshproxy_port=sshproxy_port,
sshproxy_user=sshproxy_user,
sshproxy_password=sshproxy_password,
sshproxy_key_filename=sshproxy_key_filename,
diff --git a/x2go/session.py b/x2go/session.py
index c04a391..8609cbe 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -111,7 +111,7 @@ _X2GO_TERMINAL_PARAMS = ('geometry', 'depth', 'link', 'pack', 'dpi',
'profiles_backend', 'settings_backend', 'printing_backend',
)
"""A list of allowed X2Go terminal session parameters."""
-_X2GO_SSHPROXY_PARAMS = ('sshproxy_host', 'sshproxy_user', 'sshproxy_password',
+_X2GO_SSHPROXY_PARAMS = ('sshproxy_host', 'sshproxy_port', 'sshproxy_user', 'sshproxy_password',
'sshproxy_key_filename', 'sshproxy_pkey', 'sshproxy_tunnel',
)
"""A list of allowed X2Go SSH proxy parameters."""
diff --git a/x2go/utils.py b/x2go/utils.py
index 189e875..4e8d468 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -323,6 +323,7 @@ def _convert_SessionProfileOptions_2_SessionParams(options):
'sshproxytype',
'sshproxysameuser',
'sshproxysamepass',
+ 'sshproxyautologin',
]
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