diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2020-10-07 04:25:43 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-10-07 04:34:11 +0200 |
| commit | 04c06d04475f1f673e9d9743710d194453fe3888 (patch) | |
| tree | 926866c3707af7026cbb025915728edc1bb56368 /hostfile.c | |
| parent | upstream: don't UpdateHostkeys when the hostkey is verified by the (diff) | |
| download | openssh-04c06d04475f1f673e9d9743710d194453fe3888.tar.xz openssh-04c06d04475f1f673e9d9743710d194453fe3888.zip | |
upstream: Fix UpdateHostkeys/HashKnownHosts/CheckHostIP bug
When all of UpdateHostkeys, HashKnownHosts and ChechHostIP
were enabled and new host keys were learned, known_hosts IP
entries were not being recorded for new host keys.
reported by matthieu@ ok markus@
OpenBSD-Commit-ID: a654a8290bd1c930aac509e8158cf85e42e49cb7
Diffstat (limited to '')
| -rw-r--r-- | hostfile.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/hostfile.c b/hostfile.c index 00462555f..650ad66f7 100644 --- a/hostfile.c +++ b/hostfile.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hostfile.c,v 1.83 2020/10/04 09:45:01 djm Exp $ */ +/* $OpenBSD: hostfile.c,v 1.84 2020/10/07 02:25:43 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -451,6 +451,9 @@ write_host_entry(FILE *f, const char *host, const char *ip, else error("%s: sshkey_write failed: %s", __func__, ssh_err(r)); fputc('\n', f); + /* If hashing is enabled, the IP address needs to go on its own line */ + if (success && store_hash && ip != NULL) + success = write_host_entry(f, ip, NULL, key, 1); return success; } |