=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh.c,v retrieving revision 1.516 retrieving revision 1.517 diff -u -r1.516 -r1.517 --- src/usr.bin/ssh/ssh.c 2020/01/27 20:51:32 1.516 +++ src/usr.bin/ssh/ssh.c 2020/01/28 07:24:15 1.517 @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.516 2020/01/27 20:51:32 markus Exp $ */ +/* $OpenBSD: ssh.c,v 1.517 2020/01/28 07:24:15 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -1237,6 +1237,9 @@ options.request_tty == REQUEST_TTY_NO) { debug("UpdateHostKeys=ask is incompatible with " "remote command execution; disabling"); + options.update_hostkeys = 0; + } else if (options.log_level < SYSLOG_LEVEL_INFO) { + /* no point logging anything; user won't see it */ options.update_hostkeys = 0; } }