diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2020-01-28 07:24:15 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-01-29 18:52:55 +1100 |
| commit | 156bef36f93a48212383235bb8e3d71eaf2b2777 (patch) | |
| tree | a68080738b9771435ab3d8f11f043f73cdd328f1 | |
| parent | ec8a759b4045e54d6b38e690ffee4cbffc53c7b7 (diff) | |
upstream: disable UpdateHostKeys=ask when in quiet mode; "work for
me" matthieu@
OpenBSD-Commit-ID: 60d7b5eb91accf935ed9852650a826d86db2ddc7
| -rw-r--r-- | ssh.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -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) |