diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2020-01-29 08:17:49 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-01-30 18:22:34 +1100 |
| commit | 14ef4efe2bf4180e085ea6738fdbebc199458b0c (patch) | |
| tree | df39d0e9e3911b4b251f485b557dd6e7bd49bab8 | |
| parent | 101ebc3a8cfa78d2e615afffbef9861bbbabf1ff (diff) | |
upstream: markus suggests a simplification to previous
OpenBSD-Commit-ID: 10bbfb6607ebbb9a018dcd163f0964941adf58de
| -rw-r--r-- | clientloop.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/clientloop.c b/clientloop.c index 175b8480..17015544 100644 --- a/clientloop.c +++ b/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.336 2020/01/29 07:51:30 djm Exp $ */ +/* $OpenBSD: clientloop.c,v 1.337 2020/01/29 08:17:49 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1888,11 +1888,8 @@ hostkeys_find(struct hostkey_foreach_line *l, void *_ctx) } static void -hostkey_change_preamble(void) +hostkey_change_preamble(LogLevel loglevel) { - LogLevel loglevel = options.update_hostkeys == SSH_UPDATE_HOSTKEYS_ASK ? - SYSLOG_LEVEL_INFO : SYSLOG_LEVEL_VERBOSE; - do_log2(loglevel, "The server has updated its host keys."); do_log2(loglevel, "These changes were verified by the server's " "existing trusted key."); @@ -1915,7 +1912,7 @@ update_known_hosts(struct hostkeys_update_ctx *ctx) options.fingerprint_hash, SSH_FP_DEFAULT)) == NULL) fatal("%s: sshkey_fingerprint failed", __func__); if (first && asking) - hostkey_change_preamble(); + hostkey_change_preamble(loglevel); do_log2(loglevel, "Learned new hostkey: %s %s", sshkey_type(ctx->keys[i]), fp); first = 0; @@ -1926,7 +1923,7 @@ update_known_hosts(struct hostkeys_update_ctx *ctx) options.fingerprint_hash, SSH_FP_DEFAULT)) == NULL) fatal("%s: sshkey_fingerprint failed", __func__); if (first && asking) - hostkey_change_preamble(); + hostkey_change_preamble(loglevel); do_log2(loglevel, "Deprecating obsolete hostkey: %s %s", sshkey_type(ctx->old_keys[i]), fp); first = 0; |