diff options
author | djm@openbsd.org <djm@openbsd.org> | 2020-01-25 01:22:31 +0100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2020-01-25 01:36:20 +0100 |
commit | c6f06fd38a257b9fcc7d6760f8fb6d505dccb628 (patch) | |
tree | c0203c4635e6ef519445328fb00559cc1978b73c /readconf.c | |
parent | upstream: allow UpdateKnownHosts=yes to function when multiple (diff) | |
download | openssh-c6f06fd38a257b9fcc7d6760f8fb6d505dccb628.tar.xz openssh-c6f06fd38a257b9fcc7d6760f8fb6d505dccb628.zip |
upstream: set UpdateKnownHosts=ask by default; bz#2894; ok
markus@
OpenBSD-Commit-ID: f09cb3177f3a14c96428e14f347e976a8a531fee
Diffstat (limited to 'readconf.c')
-rw-r--r-- | readconf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/readconf.c b/readconf.c index b25984548..36312d583 100644 --- a/readconf.c +++ b/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 @@ -2171,7 +2171,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; #ifdef ENABLE_SK_INTERNAL if (options->sk_provider == NULL) options->sk_provider = xstrdup("internal"); |