diff options
author | djm@openbsd.org <djm@openbsd.org> | 2018-11-19 04:12:32 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-11-19 15:14:32 +1100 |
commit | 928f1231f65f88cd4c73e6e0edd63d2cf6295d77 (patch) | |
tree | e72cade439a4a56ad978e5624f36821c0af7c950 /sshd.c | |
parent | 7fca94edbe8ca9f879da9fdd2afd959c4180f4c7 (diff) |
upstream: silence (to log level debug2) failure messages when
loading the default hostkeys. Hostkeys explicitly specified in the
configuration or on the command-line are still reported as errors, and
failure to load at least one host key remains a fatal error.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Based on patch from Dag-Erling Smørgrav via
https://github.com/openssh/openssh-portable/pull/103
ok markus@
OpenBSD-Commit-ID: ffc2e35a75d1008effaf05a5e27425041c27b684
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.518 2018/11/16 03:26:01 djm Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.519 2018/11/19 04:12:32 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1588,7 +1588,7 @@ main(int ac, char **av) | |||
1588 | break; | 1588 | break; |
1589 | case 'h': | 1589 | case 'h': |
1590 | servconf_add_hostkey("[command-line]", 0, | 1590 | servconf_add_hostkey("[command-line]", 0, |
1591 | &options, optarg); | 1591 | &options, optarg, 1); |
1592 | break; | 1592 | break; |
1593 | case 't': | 1593 | case 't': |
1594 | test_flag = 1; | 1594 | test_flag = 1; |
@@ -1760,15 +1760,18 @@ main(int ac, char **av) | |||
1760 | } | 1760 | } |
1761 | 1761 | ||
1762 | for (i = 0; i < options.num_host_key_files; i++) { | 1762 | for (i = 0; i < options.num_host_key_files; i++) { |
1763 | int ll = options.host_key_file_userprovided[i] ? | ||
1764 | SYSLOG_LEVEL_ERROR : SYSLOG_LEVEL_DEBUG1; | ||
1765 | |||
1763 | if (options.host_key_files[i] == NULL) | 1766 | if (options.host_key_files[i] == NULL) |
1764 | continue; | 1767 | continue; |
1765 | if ((r = sshkey_load_private(options.host_key_files[i], "", | 1768 | if ((r = sshkey_load_private(options.host_key_files[i], "", |
1766 | &key, NULL)) != 0 && r != SSH_ERR_SYSTEM_ERROR) | 1769 | &key, NULL)) != 0 && r != SSH_ERR_SYSTEM_ERROR) |
1767 | error("Error loading host key \"%s\": %s", | 1770 | do_log2(ll, "Unable to load host key \"%s\": %s", |
1768 | options.host_key_files[i], ssh_err(r)); | 1771 | options.host_key_files[i], ssh_err(r)); |
1769 | if ((r = sshkey_load_public(options.host_key_files[i], | 1772 | if ((r = sshkey_load_public(options.host_key_files[i], |
1770 | &pubkey, NULL)) != 0 && r != SSH_ERR_SYSTEM_ERROR) | 1773 | &pubkey, NULL)) != 0 && r != SSH_ERR_SYSTEM_ERROR) |
1771 | error("Error loading host key \"%s\": %s", | 1774 | do_log2(ll, "Unable to load host key \"%s\": %s", |
1772 | options.host_key_files[i], ssh_err(r)); | 1775 | options.host_key_files[i], ssh_err(r)); |
1773 | if (pubkey == NULL && key != NULL) | 1776 | if (pubkey == NULL && key != NULL) |
1774 | if ((r = sshkey_from_private(key, &pubkey)) != 0) | 1777 | if ((r = sshkey_from_private(key, &pubkey)) != 0) |
@@ -1785,7 +1788,7 @@ main(int ac, char **av) | |||
1785 | keytype = key->type; | 1788 | keytype = key->type; |
1786 | accumulate_host_timing_secret(cfg, key); | 1789 | accumulate_host_timing_secret(cfg, key); |
1787 | } else { | 1790 | } else { |
1788 | error("Could not load host key: %s", | 1791 | do_log2(ll, "Unable to load host key: %s", |
1789 | options.host_key_files[i]); | 1792 | options.host_key_files[i]); |
1790 | sensitive_data.host_keys[i] = NULL; | 1793 | sensitive_data.host_keys[i] = NULL; |
1791 | sensitive_data.host_pubkeys[i] = NULL; | 1794 | sensitive_data.host_pubkeys[i] = NULL; |