[X2Go-Commits] python-x2go.git - master (branch) updated: 0.4.0.8-10-gd3378ca

X2Go dev team git-admin at x2go.org
Sun Sep 8 01:14:14 CEST 2013


The branch, master has been updated
       via  d3378ca11d1cc32dcdc81a5890d011cf958a0df8 (commit)
      from  52b1c85cf8fad6c0b4e2afb8bd26d576dcd2852e (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 d3378ca11d1cc32dcdc81a5890d011cf958a0df8
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Sep 8 01:13:24 2013 +0200

    Keep private key information even if force_password_auth is set in the control session's connect() method.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                 |    2 ++
 x2go/backends/control/_stdout.py |    5 -----
 2 files changed, 2 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 4c675f2..669f8da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ python-x2go (0.4.0.9-0~x2go1) UNRELEASED; urgency=low
       as well as SSH proxy connections).
     - Invalidate SSH private keys (filename, pkey object) when look_for_keys is
       requested.
+    - Keep private key information even if force_password_auth is set in the
+      control session's connect() method.
 
  -- 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 733b16d..f3999d3 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -827,11 +827,6 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient):
         if add_to_known_hosts:
             self.set_missing_host_key_policy(checkhosts.X2GoAutoAddPolicy(caller=self, session_instance=session_instance, fake_hostname=_fake_hostname))
 
-        # disable pub/priv key authentication if forced
-        if force_password_auth:
-            key_filename = None
-            pkey = None
-
         # trailing whitespace tolerance in hostname
         hostname = hostname.strip()
 


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