This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/0.5.0.x in repository python-x2go. commit fc4c50c2e15a65fb677f2e207bcc4f4ea865b4d0 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Sep 24 19:22:36 2017 +0200 x2go/backends/control/plain.p: Fix passphrase unlocking of private keys. --- x2go/backends/control/plain.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x2go/backends/control/plain.py b/x2go/backends/control/plain.py index 3dcc3ef..242b7e6 100644 --- a/x2go/backends/control/plain.py +++ b/x2go/backends/control/plain.py @@ -995,12 +995,12 @@ class X2GoControlSession(paramiko.SSHClient): look_for_keys=False) elif (key_filename and os.path.exists(os.path.normpath(key_filename))) or pkey: self.logger('trying SSH pub/priv key authentication with server', loglevel=log.loglevel_DEBUG) - paramiko.SSHClient.connect(self, _hostname, port=port, username=username, pkey=pkey, + paramiko.SSHClient.connect(self, _hostname, port=port, username=username, pkey=pkey, password=passphrase, key_filename=key_filename, timeout=timeout, allow_agent=False, look_for_keys=False) else: self.logger('trying SSH key discovery or agent authentication with server', loglevel=log.loglevel_DEBUG) - paramiko.SSHClient.connect(self, _hostname, port=port, username=username, pkey=None, + paramiko.SSHClient.connect(self, _hostname, port=port, username=username, pkey=None, password=passphrase, key_filename=None, timeout=timeout, allow_agent=allow_agent, look_for_keys=look_for_keys) -- Alioth's /srv/git/code.x2go.org/python-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git