[X2go-Commits] python-x2go.git - master (branch) updated: 0.2.0.0-2-g0974e80

[X2Go dev team]

The branch, master has been updated
       via  0974e8057415cb5946c3206fe39632d0b667e7b2 (commit)
      from  ed3dd9ba498b4d12fb592ca8a715f1a8340ca149 (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 0974e8057415cb5946c3206fe39632d0b667e7b2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed May 30 00:25:49 2012 +0200

    Re-add lost line in control session's connect method that let SSH host key checks fail.

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

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 67a5035..ab27ff0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 python-x2go (0.2.0.1-0~x2go1) UNRELEASED; urgency=low
 
-  * Continue development...
+  * Bugfix release (0.2.0.1)
+    - Re-add lost line in control session's connect method that let
+      SSH host key checks fail.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 29 May 2012 21:09:03 +0200
 
diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py
index 169f82c..a5c2fd6 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -700,6 +700,12 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
                 gevent.sleep(.1)
                 port = self.sshproxy_session.get_local_proxy_port()
 
+        if not add_to_known_hosts and session_instance:
+            self.set_missing_host_key_policy(checkhosts.X2goInteractiveAddPolicy(caller=self, session_instance=session_instance))
+
+        if add_to_known_hosts:
+            self.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+
         # disable pub/priv key authentication if forced
         if force_password_auth:
             key_filename = None


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).