tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: enable UpdateHostkeys by default when the configuration 

has not overridden UserKnownHostsFile; ok markus@ "The timing is perfect"
deraadt@

OpenBSD-Commit-ID: 62df71c9c5242da5763cb473c2a2deefbd0cef60
This commit is contained in:
djm@openbsd.org 2020-10-03 08:30:47 +00:00 committed by Damien Miller
parent 332f215372
commit 1286981d08
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
readconf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: readconf.c,v 1.335 2020/08/27 02:11:09 djm Exp $ */ /* $OpenBSD: readconf.c,v 1.336 2020/10/03 08:30:47 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
@ -2178,8 +2178,14 @@ 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) {
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_NO; options->update_hostkeys = SSH_UPDATE_HOSTKEYS_NO;
}
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);

4
ssh_config.5
View File

@ -33,7 +33,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: ssh_config.5,v 1.333 2020/10/03 04:15:06 djm Exp $ .\" $OpenBSD: ssh_config.5,v 1.334 2020/10/03 08:30:47 djm Exp $
.Dd $Mdocdate: October 3 2020 $ .Dd $Mdocdate: October 3 2020 $
.Dt SSH_CONFIG 5 .Dt SSH_CONFIG 5
.Os .Os
@ -1726,7 +1726,7 @@ is enabled by default if the user has not overridden the default
setting, otherwise setting, otherwise
.Cm UpdateHostKeys .Cm UpdateHostKeys
will be set to will be set to
.Cm ask . .Cm no .
.Pp .Pp
If If
.Cm UpdateHostKeys .Cm UpdateHostKeys