diff options
| -rw-r--r-- | usr.bin/ssh/readconf.c | 7 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh_config.5 | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/usr.bin/ssh/readconf.c b/usr.bin/ssh/readconf.c index 68670d21f44..6f7a57de4be 100644 --- a/usr.bin/ssh/readconf.c +++ b/usr.bin/ssh/readconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: readconf.c,v 1.337 2020/10/03 09:22:26 djm Exp $ */ +/* $OpenBSD: readconf.c,v 1.338 2020/10/07 02:18:45 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -2152,9 +2152,10 @@ fill_default_options(Options * options) xstrdup(_PATH_SSH_SYSTEM_HOSTFILE2); } if (options->update_hostkeys == -1) { - if (options->num_user_hostfiles == 0 || + if (options->verify_host_key_dns <= 0 && + (options->num_user_hostfiles == 0 || (options->num_user_hostfiles == 1 && strcmp(options-> - user_hostfiles[0], _PATH_SSH_USER_HOSTFILE) == 0)) + user_hostfiles[0], _PATH_SSH_USER_HOSTFILE) == 0))) options->update_hostkeys = SSH_UPDATE_HOSTKEYS_YES; else options->update_hostkeys = SSH_UPDATE_HOSTKEYS_NO; diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5 index f62f0420cca..d1c2935d88f 100644 --- a/usr.bin/ssh/ssh_config.5 +++ b/usr.bin/ssh/ssh_config.5 @@ -33,8 +33,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh_config.5,v 1.334 2020/10/03 08:30:47 djm Exp $ -.Dd $Mdocdate: October 3 2020 $ +.\" $OpenBSD: ssh_config.5,v 1.335 2020/10/07 02:18:45 djm Exp $ +.Dd $Mdocdate: October 7 2020 $ .Dt SSH_CONFIG 5 .Os .Sh NAME @@ -1724,7 +1724,9 @@ host was already trusted or explicitly accepted by the user. .Cm UpdateHostKeys is enabled by default if the user has not overridden the default .Cm UserKnownHostsFile -setting, otherwise +setting and has not enabled +.Cm VerifyHostKeyDNS , +otherwise .Cm UpdateHostKeys will be set to .Cm no . |