upstream: disable UpdateHostKeys=ask when in quiet mode; "work for

me" matthieu@

OpenBSD-Commit-ID: 60d7b5eb91accf935ed9852650a826d86db2ddc7

diff --git a/ssh.c b/ssh.c
index 380e1e6677c60582f23a7b9acf01f2e83ae4be49..35972fe39209950bc2c332dde18a51da8902ad40 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -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 <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1259,6 +1259,9 @@ main(int ac, char **av)
                        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;
                }
        }
        if (options.connection_attempts <= 0)