summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2020-01-25 00:22:31 +0000
committerDamien Miller <djm@mindrot.org>2020-01-25 11:36:20 +1100
commitc6f06fd38a257b9fcc7d6760f8fb6d505dccb628 (patch)
treec0203c4635e6ef519445328fb00559cc1978b73c
parent7955633a554397bc24913cec9fd7285002935f7e (diff)
upstream: set UpdateKnownHosts=ask by default; bz#2894; ok
markus@ OpenBSD-Commit-ID: f09cb3177f3a14c96428e14f347e976a8a531fee
-rw-r--r--readconf.c4
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 @@
1/* $OpenBSD: readconf.c,v 1.322 2020/01/23 10:24:29 dtucker Exp $ */ 1/* $OpenBSD: readconf.c,v 1.323 2020/01/25 00:22:31 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
@@ -2171,7 +2171,7 @@ fill_default_options(Options * options)
2171 if (options->fingerprint_hash == -1) 2171 if (options->fingerprint_hash == -1)
2172 options->fingerprint_hash = SSH_FP_HASH_DEFAULT; 2172 options->fingerprint_hash = SSH_FP_HASH_DEFAULT;
2173 if (options->update_hostkeys == -1) 2173 if (options->update_hostkeys == -1)
2174 options->update_hostkeys = 0; 2174 options->update_hostkeys = SSH_UPDATE_HOSTKEYS_ASK;
2175#ifdef ENABLE_SK_INTERNAL 2175#ifdef ENABLE_SK_INTERNAL
2176 if (options->sk_provider == NULL) 2176 if (options->sk_provider == NULL)
2177 options->sk_provider = xstrdup("internal"); 2177 options->sk_provider = xstrdup("internal");