[X2Go-Commits] [x2gobroker] 01/01: only load user host keys if the file exists

git-admin at x2go.org git-admin at x2go.org
Thu Mar 20 09:13:16 CET 2014


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit 89856dd3fa46f5fe60afd6a30b397a9bcba0b29c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Mar 20 09:13:13 2014 +0100

    only load user host keys if the file exists
---
 x2gobroker/agent.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py
index a95a76f..0e035fa 100644
--- a/x2gobroker/agent.py
+++ b/x2gobroker/agent.py
@@ -155,7 +155,8 @@ def call_remote_broker_agent(username, mode, cmdline_args=[], remote_agent=None)
     try:
         client = paramiko.SSHClient()
         client.load_system_host_keys()
-        client.load_host_keys(os.expanduser("~/.ssh/known_hosts"))
+        if os.path.exists(os.expanduser("~/.ssh/known_hosts")):
+            client.load_host_keys(os.expanduser("~/.ssh/known_hosts"))
         client.set_missing_host_key_policy(remote_agent['host_key_policy'])
         client.connect(remote_hostname, remote_port, remote_username, look_for_keys=True, allow_agent=True)
 

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git



More information about the x2go-commits mailing list