RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: disable UpdateHostKeys=ask if command is specified; ok 

djm@ sthen@

OpenBSD-Commit-ID: e5bcc45eadb78896637d4143d289f1e42c2ef5d7
This commit is contained in:
markus@openbsd.org 2020-01-27 20:51:32 +00:00 committed by Damien Miller
parent 1e1db0544f
commit da22216b5d
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ssh.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh.c,v 1.515 2020/01/25 00:21:08 djm Exp $ */
/* $OpenBSD: ssh.c,v 1.516 2020/01/27 20:51:32 markus Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1248,11 +1248,18 @@ main(int ac, char **av)
strcmp(options.proxy_command, "-") == 0 &&
options.proxy_use_fdpass)
fatal("ProxyCommand=- and ProxyUseFDPass are incompatible");
if (options.control_persist && options.control_path != NULL &&
options.update_hostkeys == SSH_UPDATE_HOSTKEYS_ASK) {
debug("UpdateHostKeys=ask is incompatible with ControlPersist; "
"disabling");
options.update_hostkeys = 0;
if (options.update_hostkeys == SSH_UPDATE_HOSTKEYS_ASK) {
if (options.control_persist && options.control_path != NULL) {
debug("UpdateHostKeys=ask is incompatible with "
"ControlPersist; disabling");
options.update_hostkeys = 0;
} else if (sshbuf_len(command) != 0 ||
options.remote_command != NULL ||
options.request_tty == REQUEST_TTY_NO) {
debug("UpdateHostKeys=ask is incompatible with "
"remote command execution; disabling");
options.update_hostkeys = 0;
}
}
if (options.connection_attempts <= 0)
fatal("Invalid number of ConnectionAttempts");