From 613dcc95e69109ed539e525ae633ab1e9a6e38ea Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 3 Jul 2018 09:04:16 +0200 Subject: [PATCH] knownhosts: Fix return codes Signed-off-by: Andreas Schneider --- src/knownhosts.c | 8 ++++---- tests/unittests/torture_knownhosts_parsing.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/knownhosts.c b/src/knownhosts.c index 1e17f57f..862debd9 100644 --- a/src/knownhosts.c +++ b/src/knownhosts.c @@ -542,19 +542,19 @@ enum ssh_known_hosts_e ssh_session_has_known_hosts_entry(ssh_session session) host_port = ssh_session_get_host_port(session); if (host_port == NULL) { - return SSH_KNOWN_HOSTS_NOT_FOUND; + return SSH_KNOWN_HOSTS_ERROR; } rc = ssh_known_hosts_read_entries(host_port, session->opts.knownhosts, &entry_list); if (rc != 0) { - return SSH_KNOWN_HOSTS_NOT_FOUND; + return SSH_KNOWN_HOSTS_UNKNOWN; } if (ssh_list_count(entry_list) == 0) { ssh_list_free(entry_list); - return SSH_KNOWN_HOSTS_NOT_FOUND; + return SSH_KNOWN_HOSTS_UNKNOWN; } for (it = ssh_list_get_iterator(entry_list); @@ -738,7 +738,7 @@ ssh_known_hosts_check_server_key(const char *hosts_entry, filename, &entry_list); if (rc != 0) { - return SSH_KNOWN_HOSTS_NOT_FOUND; + return SSH_KNOWN_HOSTS_UNKNOWN; } it = ssh_list_get_iterator(entry_list); diff --git a/tests/unittests/torture_knownhosts_parsing.c b/tests/unittests/torture_knownhosts_parsing.c index 05fef4df..25d416b7 100644 --- a/tests/unittests/torture_knownhosts_parsing.c +++ b/tests/unittests/torture_knownhosts_parsing.c @@ -244,7 +244,7 @@ static void torture_knownhosts_host_exists(void **state) ssh_options_set(session, SSH_OPTIONS_HOST, "wurstbrot"); found = ssh_session_has_known_hosts_entry(session); - assert_true(found == SSH_KNOWN_HOSTS_NOT_FOUND); + assert_true(found == SSH_KNOWN_HOSTS_UNKNOWN); ssh_free(session); }