aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnderson Toshiyuki Sasaki <ansasaki@redhat.com>2019-06-28 13:27:34 +0200
committerAnderson Toshiyuki Sasaki <ansasaki@redhat.com>2019-07-04 10:29:20 +0200
commite5a64a3d6b1b601cbaf207468a6658d1a4fa0031 (patch)
treecf86682230702e03892b044f0f1ff77aa28e1f8c
parentad68de7271e6ccda261df4d9fc827321e7d90fd0 (diff)
downloadlibssh-e5a64a3d6b1b601cbaf207468a6658d1a4fa0031.tar.gz
libssh-e5a64a3d6b1b601cbaf207468a6658d1a4fa0031.tar.xz
libssh-e5a64a3d6b1b601cbaf207468a6658d1a4fa0031.zip
knownhosts: Read knownhosts file only if found
Avoid trying to open the files if they are not accessible. This was already treated as a non-error, but with this we save one function call. Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com> Reviewed-by: Jakub Jelen <jjelen@redhat.com>
-rw-r--r--src/knownhosts.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/knownhosts.c b/src/knownhosts.c
index 9383cc97..8040a0c0 100644
--- a/src/knownhosts.c
+++ b/src/knownhosts.c
@@ -691,7 +691,7 @@ enum ssh_known_hosts_e ssh_session_has_known_hosts_entry(ssh_session session)
return SSH_KNOWN_HOSTS_ERROR;
}
- if (session->opts.knownhosts != NULL) {
+ if (known_hosts_found) {
rc = ssh_known_hosts_read_entries(host_port,
session->opts.knownhosts,
&entry_list);
@@ -702,7 +702,7 @@ enum ssh_known_hosts_e ssh_session_has_known_hosts_entry(ssh_session session)
}
}
- if (session->opts.global_knownhosts != NULL) {
+ if (global_known_hosts_found) {
rc = ssh_known_hosts_read_entries(host_port,
session->opts.global_knownhosts,
&entry_list);