summaryrefslogtreecommitdiff
path: root/readconf.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2020-02-03 23:47:57 +0000
committerDamien Miller <djm@mindrot.org>2020-02-04 10:52:17 +1100
commit501f3582438cb2cb1cb92be0f17be490ae96fb23 (patch)
tree980fae62c69ea0855dc3954286494922be4e9f15 /readconf.c
parent072f3b832d2a4db8d9880effcb6c4d0dad676504 (diff)
upstream: revert enabling UpdateHostKeys by default - there are still
corner cases we need to address; ok markus OpenBSD-Commit-ID: ff7ad941bfdc49fb1d8baa95fd0717a61adcad57
Diffstat (limited to 'readconf.c')
-rw-r--r--readconf.c17
1 files changed, 3 insertions, 14 deletions
diff --git a/readconf.c b/readconf.c
index a6a16018..20f1c04e 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.324 2020/01/30 22:19:32 djm Exp $ */
+/* $OpenBSD: readconf.c,v 1.325 2020/02/03 23:47:57 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2110,19 +2110,8 @@ fill_default_options(Options * options)
options->system_hostfiles[options->num_system_hostfiles++] =
xstrdup(_PATH_SSH_SYSTEM_HOSTFILE2);
}
- if (options->update_hostkeys == -1) {
- /*
- * Enable UpdateHostKeys non-interactively if the user has
- * not overridden the default known_hosts selection, or has
- * overridden it with the default. Otherwise, prompt.
- */
- if (options->num_user_hostfiles == 0 ||
- (options->num_user_hostfiles == 1 && strcmp(options->
- user_hostfiles[0], _PATH_SSH_USER_HOSTFILE) == 0))
- options->update_hostkeys = SSH_UPDATE_HOSTKEYS_YES;
- else
- options->update_hostkeys = SSH_UPDATE_HOSTKEYS_ASK;
- }
+ if (options->update_hostkeys == -1)
+ options->update_hostkeys = SSH_UPDATE_HOSTKEYS_NO;
if (options->num_user_hostfiles == 0) {
options->user_hostfiles[options->num_user_hostfiles++] =
xstrdup(_PATH_SSH_USER_HOSTFILE);