[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.4.0.8-7-g77bf9f6
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:29:48 CET 2014
The branch, build-baikal has been updated
via 77bf9f678ef56d3ccd60c29eba23840fa095c476 (commit)
from 9a1a4ca33406da3af938254e18e568c1fc354b10 (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 | 2 ++
x2go/backends/control/_stdout.py | 4 ++++
x2go/sshproxy.py | 5 +++++
3 files changed, 11 insertions(+)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 48badf3..4c675f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ python-x2go (0.4.0.9-0~x2go1) UNRELEASED; urgency=low
plain text password.
- Support encryption passphrases on SSH private key files (X2Go SSH connections
as well as SSH proxy connections).
+ - Invalidate SSH private keys (filename, pkey object) when look_for_keys is
+ requested.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Wed, 07 Aug 2013 12:18:46 +0200
diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py
index 648b72e..fc1deda 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -778,6 +778,10 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient):
if self.unique_hostkey_aliases:
_fake_hostname = "[%s]:%s" % (hostname, port)
+ if look_for_keys:
+ key_filename = None
+ pkey = None
+
if use_sshproxy and sshproxy_host and sshproxy_user:
try:
diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py
index 9ef3cea..8b01748 100644
--- a/x2go/sshproxy.py
+++ b/x2go/sshproxy.py
@@ -179,6 +179,11 @@ class X2GoSSHProxy(paramiko.SSHClient, threading.Thread):
self.local_host = self.local_host.strip()
self.remote_host = self.remote_host.strip()
+ # do not use explicitly given keys if look_for_keys has got activated
+ if look_for_keys:
+ sshproxy_key_filename = None
+ sshproxy_pkey = None
+
# enforce IPv4 for localhost addresses!!!
_hostname = self.hostname
if _hostname in ('localhost', 'localhost.localdomain'):
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