tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-30 17:25:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream: revert enabling UpdateHostKeys by default - there are still

Browse Source 
corner cases we need to address; ok markus

OpenBSD-Commit-ID: ff7ad941bfdc49fb1d8baa95fd0717a61adcad57
This commit is contained in:
djm@openbsd.org 2020-02-03 23:47:57 +00:00 committed by Damien Miller
parent 072f3b832d
commit 501f358243
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
readconf.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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++] = options->system_hostfiles[options->num_system_hostfiles++] =
xstrdup(_PATH_SSH_SYSTEM_HOSTFILE2); xstrdup(_PATH_SSH_SYSTEM_HOSTFILE2);
} }
if (options->update_hostkeys == -1) { if (options->update_hostkeys == -1)
/* options->update_hostkeys = SSH_UPDATE_HOSTKEYS_NO;
* 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->num_user_hostfiles == 0) { if (options->num_user_hostfiles == 0) {
options->user_hostfiles[options->num_user_hostfiles++] = options->user_hostfiles[options->num_user_hostfiles++] =
xstrdup(_PATH_SSH_USER_HOSTFILE); xstrdup(_PATH_SSH_USER_HOSTFILE);