From 04c06d04475f1f673e9d9743710d194453fe3888 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Wed, 7 Oct 2020 02:25:43 +0000 Subject: 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 --- hostfile.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'hostfile.c') 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 * Copyright (c) 1995 Tatu Ylonen , 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; } -- cgit v1.2.3