mirror of
git://anongit.mindrot.org/openssh.git
synced 2025-01-17 07:00:50 +00:00
upstream: disable UpdateHostKeys=ask when in quiet mode; "work for
me" matthieu@ OpenBSD-Commit-ID: 60d7b5eb91accf935ed9852650a826d86db2ddc7
This commit is contained in:
parent
ec8a759b40
commit
156bef36f9
5
ssh.c
5
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)
|
||||
|
Loading…
Reference in New Issue
Block a user