The branch, master has been updated via 8ba5b2566d646c596e3a89ffaaf3a52771e9ea4a (commit) from 6c1c0d22eb6c6693754f6fc845ab715b20fe3dc0 (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 8ba5b2566d646c596e3a89ffaaf3a52771e9ea4a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Nov 5 21:04:07 2012 +0100 Allow mixing key file, key object, key discovery and agent authentication. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/backends/control/_stdout.py | 6 +++--- x2go/sshproxy.py | 8 ++++---- 3 files changed, 9 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 765cb68..e3a6924 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,8 @@ python-x2go (0.2.1.0-0~x2go1) UNRELEASED; urgency=low - Avoid false positive notifications about started-by-other sessions. - Introduce locks for session registrations. - Wait for mounting of print and mimebox spooling share. + - Allow mixing key file, key object, key discovery and agent + authentication. * /debian/rules: + Allow package build on systems with missing dh_python2. * /debian/control: diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index e27a4af..2186b71 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -779,12 +779,12 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): self.logger('trying SSH pub/priv key authentication with server', loglevel=log.loglevel_DEBUG) if password and force_password_auth: paramiko.SSHClient.connect(self, _hostname, port=port, username=username, pkey=None, password=password, - key_filename=key_filename, timeout=timeout, allow_agent=False, + key_filename=None, timeout=timeout, allow_agent=False, look_for_keys=False) elif key_filename or pkey: paramiko.SSHClient.connect(self, _hostname, port=port, username=username, pkey=pkey, - key_filename=key_filename, timeout=timeout, allow_agent=False, - look_for_keys=False) + key_filename=key_filename, timeout=timeout, allow_agent=allow_agent, + look_for_keys=look_for_keys) else: paramiko.SSHClient.connect(self, _hostname, port=port, username=username, pkey=None, key_filename=None, timeout=timeout, allow_agent=allow_agent, diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py index b11bed3..67b5f75 100644 --- a/x2go/sshproxy.py +++ b/x2go/sshproxy.py @@ -214,8 +214,8 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread): self.connect(_hostname, port=self.port, username=self.username, password=password, - key_filename=key_filename, - pkey=pkey, + key_filename=None, + pkey=None, look_for_keys=False, allow_agent=False, ) @@ -224,8 +224,8 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread): username=self.username, key_filename=key_filename, pkey=pkey, - look_for_keys=False, - allow_agent=False, + look_for_keys=look_for_keys, + allow_agent=allow_agent, ) else: self.connect(_hostname, port=self.port, 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).