This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit cef25ef5cebab49e6d6a20a537035bcac2ee2fca Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Mar 20 09:04:43 2014 +0100 Load X2GOBROKER_DAEMON_USER's known_hosts key file before doing remote agent calls. --- debian/changelog | 2 ++ x2gobroker/agent.py | 1 + 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2078d82..a65728d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -111,6 +111,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low ACCEPTED after we deployed it, so that the client knows that it can its corresponding private key. - Fix https brokerage in x2gobroker-daemon-debug. + - Load X2GOBROKER_DAEMON_USER's known_hosts key file before doing + remote agent calls. * debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. + Fix SYNOPSIS texts. diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index 169f62e..a95a76f 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -155,6 +155,7 @@ 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")) 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