summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2020-01-25 00:22:31 +0000
committerdjm <djm@openbsd.org>2020-01-25 00:22:31 +0000
commit1f90789ab3c93428d97e213bb67df98acf9fd41d (patch)
treec697aa2b67aa765436baf4a1a777706e92dd5253
parentallow UpdateKnownHosts=yes to function when multiple known_hosts files (diff)
downloadwireguard-openbsd-1f90789ab3c93428d97e213bb67df98acf9fd41d.tar.xz
wireguard-openbsd-1f90789ab3c93428d97e213bb67df98acf9fd41d.zip
set UpdateKnownHosts=ask by default; bz#2894; ok markus@
-rw-r--r--usr.bin/ssh/readconf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/readconf.c b/usr.bin/ssh/readconf.c
index 11a5d677a4f..f6f4d7035cc 100644
--- a/usr.bin/ssh/readconf.c
+++ b/usr.bin/ssh/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.322 2020/01/23 10:24:29 dtucker Exp $ */
+/* $OpenBSD: readconf.c,v 1.323 2020/01/25 00:22:31 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2155,7 +2155,7 @@ fill_default_options(Options * options)
if (options->fingerprint_hash == -1)
options->fingerprint_hash = SSH_FP_HASH_DEFAULT;
if (options->update_hostkeys == -1)
- options->update_hostkeys = 0;
+ options->update_hostkeys = SSH_UPDATE_HOSTKEYS_ASK;
if (options->sk_provider == NULL)
options->sk_provider = xstrdup("internal");