From: djm@openbsd.org <djm@openbsd.org>
Date: Tue, 28 Jan 2020 07:24:15 +0000 (+0000)
Subject: upstream: disable UpdateHostKeys=ask when in quiet mode; "work for
X-Git-Tag: V_8_2_P1~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=156bef36f93a48212383235bb8e3d71eaf2b2777;p=thirdparty%2Fopenssh-portable.git

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 380e1e667..35972fe39 100644
--- 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)