[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.4.0.8-38-g73e0f19
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:15:38 CET 2014
The branch, build-baikal has been updated
via 73e0f1929f864640f7035d42796d1633baa956ff (commit)
from d7ba282d42c780a4ad914a449514aeee690199b0 (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 | 14 +++++++-------
2 files changed, 8 insertions(+), 7 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index daaa010..50ec35f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,7 @@ python-x2go (0.4.0.9-0x2go1) UNRELEASED; urgency=low
- Fix tests for two-factor authentication in control session and SSH proxy
code.
- Fix regression: Make password logins with PyHoca-CLI succeed again.
+ - Make channel compression to all authentication methods.
* debian/source/format:
+ Switch to format 1.0.
* python-x2go.spec:
diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py
index 1840e74..6ecf703 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -923,13 +923,6 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient):
key_filename=None, timeout=timeout, allow_agent=allow_agent,
look_for_keys=look_for_keys)
- # since Paramiko 1.7.7.1 there is compression available, let's use it if present...
- t = self.get_transport()
- if x2go._paramiko.PARAMIKO_FEATURE['use-compression']:
- t.use_compression(compress=True)
- # enable keep alive callbacks
- t.set_keepalive(5)
-
except (paramiko.PasswordRequiredException, paramiko.SSHException), e:
self.close()
if type(e) == paramiko.SSHException and str(e).startswith('Two-factor authentication requires a password'):
@@ -1054,6 +1047,13 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient):
self._session_password = None
if ssh_transport is not None:
+
+ # since Paramiko 1.7.7.1 there is compression available, let's use it if present...
+ if x2go._paramiko.PARAMIKO_FEATURE['use-compression']:
+ t.use_compression(compress=True)
+ # enable keep alive callbacks
+ t.set_keepalive(5)
+
self.session_died = False
self.query_server_features(force=True)
if self.forward_sshagent:
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