diff options
| author |   djm <djm@openbsd.org> | 2020-01-28 07:24:15 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2020-01-28 07:24:15 +0000 |
| commit | e6e4bf8cc5fb9c169a31b3198b986ade275c23c9 (patch) | |
| tree | 9a9f256e9d02b18e737cab8f09f6280d8a996bcc /usr.bin/ssh/ssh.c | |
| parent | drm/radeon: fix bad DMA from INTERRUPT_CNTL2 (diff) | |
| download | wireguard-openbsd-e6e4bf8cc5fb9c169a31b3198b986ade275c23c9.tar.xz wireguard-openbsd-e6e4bf8cc5fb9c169a31b3198b986ade275c23c9.zip | |
disable UpdateHostKeys=ask when in quiet mode;
"work for me" matthieu@
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 208c282e0bf..314b3c5f29c 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/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 @@ -1238,6 +1238,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) |