[openssh-commits] [openssh] 01/03: upstream: disable UpdateHostKeys=ask when in quiet mode; "work for

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 156bef36f93a48212383235bb8e3d71eaf2b2777
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Tue Jan 28 07:24:15 2020 +0000

    upstream: disable UpdateHostKeys=ask when in quiet mode; "work for
    
    me" matthieu@
    
    OpenBSD-Commit-ID: 60d7b5eb91accf935ed9852650a826d86db2ddc7
---
 ssh.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ssh.c b/ssh.c
index 380e1e66..35972fe3 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 at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at 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)

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.