RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: avoid printf("%s", NULL) if using ssh 

-oUserKnownHostsFile=none and a hostkey in one of the system known hosts file
changes; ok dtucker@

OpenBSD-Commit-ID: 7ca87614bfc6da491315536a7f2301434a9fe614
This commit is contained in:
djm@openbsd.org 2023-01-13 02:44:02 +00:00 committed by Darren Tucker
parent 93fc7c5765
commit f673b49f3b
No known key found for this signature in database
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sshconnect.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshconnect.c,v 1.360 2022/11/03 21:59:20 djm Exp $ */ /* $OpenBSD: sshconnect.c,v 1.361 2023/01/13 02:44:02 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
@ -1276,8 +1276,11 @@ check_host_key(char *hostname, const struct ssh_conn_info *cinfo,
} }
/* The host key has changed. */ /* The host key has changed. */
warn_changed_key(host_key); warn_changed_key(host_key);
error("Add correct host key in %.100s to get rid of this message.", if (num_user_hostfiles > 0 || num_system_hostfiles > 0) {
user_hostfiles[0]); error("Add correct host key in %.100s to get rid "
"of this message.", num_user_hostfiles > 0 ?
user_hostfiles[0] : system_hostfiles[0]);
}
error("Offending %s key in %s:%lu", error("Offending %s key in %s:%lu",
sshkey_type(host_found->key), sshkey_type(host_found->key),
host_found->file, host_found->line); host_found->file, host_found->line);