diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2020-02-03 23:47:58 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2020-02-03 23:47:58 +0000 |
| commit | fca59065fe39ca3698f148910418098f06fbc8a3 (patch) | |
| tree | 34b68b1d2a5f0087116c811afe771c9171a33b21 /usr.bin/ssh | |
| parent | aed93ef7c19ee3d52d1247bbf928039726808481 (diff) | |
revert enabling UpdateHostKeys by default - there are still corner cases
we need to address; ok markus
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/readconf.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/usr.bin/ssh/readconf.c b/usr.bin/ssh/readconf.c index e9601f4651d..0dfa776615e 100644 --- a/usr.bin/ssh/readconf.c +++ b/usr.bin/ssh/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 @@ -2094,19 +2094,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); |