From 27c977adb2a78e861a4fe5272ab8a41d8c3cd8c0 Mon Sep 17 00:00:00 2001 From: Nick Couchman Date: Mon, 28 May 2018 10:23:47 -0400 Subject: [PATCH] GUACAMOLE-527: Make sure ssh_known_hosts exists before trying to load. --- src/common-ssh/key.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/common-ssh/key.c b/src/common-ssh/key.c index 570da8e8..66b8386b 100644 --- a/src/common-ssh/key.c +++ b/src/common-ssh/key.c @@ -35,6 +35,7 @@ #include #include +#include guac_common_ssh_key* guac_common_ssh_key_alloc(char* data, int length, char* passphrase) { @@ -268,7 +269,8 @@ int guac_common_ssh_verify_host_key(LIBSSH2_SESSION* session, guac_client* clien else { const char *guac_known_hosts = "/etc/guacamole/ssh_known_hosts"; - known_hosts = libssh2_knownhost_readfile(ssh_known_hosts, guac_known_hosts, LIBSSH2_KNOWNHOST_FILE_OPENSSH); + if (access(guac_known_hosts, F_OK) != -1) + known_hosts = libssh2_knownhost_readfile(ssh_known_hosts, guac_known_hosts, LIBSSH2_KNOWNHOST_FILE_OPENSSH); }