diff options
author | djm@openbsd.org <djm@openbsd.org> | 2020-01-25 00:21:08 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2020-01-25 11:35:56 +1100 |
commit | 7955633a554397bc24913cec9fd7285002935f7e (patch) | |
tree | 94808f0b095cf811cf322a432e9f20e84660b0f2 /hostfile.c | |
parent | e5a278a62ab49dffe96929fa8d8506c6928dba90 (diff) |
upstream: allow UpdateKnownHosts=yes to function when multiple
known_hosts files are in use. When updating host keys, ssh will now search
subsequent known_hosts files, but will add new/changed host keys to the first
specified file only. bz#2738
ok markus@
OpenBSD-Commit-ID: 6ded6d878a03e57d5aa20bab9c31f92e929dbc6c
Diffstat (limited to 'hostfile.c')
-rw-r--r-- | hostfile.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hostfile.c b/hostfile.c index 96ab880d4..4a0349a60 100644 --- a/hostfile.c +++ b/hostfile.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: hostfile.c,v 1.76 2019/07/07 01:05:00 dtucker Exp $ */ | 1 | /* $OpenBSD: hostfile.c,v 1.77 2020/01/25 00:21:08 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 |
@@ -566,6 +566,7 @@ hostfile_replace_entries(const char *filename, const char *host, const char *ip, | |||
566 | /* Remove all entries for the specified host from the file */ | 566 | /* Remove all entries for the specified host from the file */ |
567 | if ((r = hostkeys_foreach(filename, host_delete, &ctx, host, ip, | 567 | if ((r = hostkeys_foreach(filename, host_delete, &ctx, host, ip, |
568 | HKF_WANT_PARSE_KEY)) != 0) { | 568 | HKF_WANT_PARSE_KEY)) != 0) { |
569 | oerrno = errno; | ||
569 | error("%s: hostkeys_foreach failed: %s", __func__, ssh_err(r)); | 570 | error("%s: hostkeys_foreach failed: %s", __func__, ssh_err(r)); |
570 | goto fail; | 571 | goto fail; |
571 | } | 572 | } |