diff options
| author |   djm <djm@openbsd.org> | 2020-01-25 00:21:08 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2020-01-25 00:21:08 +0000 |
| commit | 7640041436cb9371c00a3b7541145cf0b83c3410 (patch) | |
| tree | cfa28a1ba14a1ec1feef8467470bf938b0291fa0 /usr.bin/ssh/ssh.c | |
| parent | process security key provider via realpath() in agent, avoids (diff) | |
| download | wireguard-openbsd-7640041436cb9371c00a3b7541145cf0b83c3410.tar.xz wireguard-openbsd-7640041436cb9371c00a3b7541145cf0b83c3410.zip | |
allow UpdateKnownHosts=yes to function when multiple known_hosts files
are in use. When updating host keys, ssh will now search subsequent
known_hosts files, but will add new/changed host keys to the first
specified file only. bz#2738
ok markus@
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 334670c79ef..ffdf2abda63 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.514 2020/01/25 00:03:36 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.515 2020/01/25 00:21:08 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1227,7 +1227,7 @@ main(int ac, char **av) strcmp(options.proxy_command, "-") == 0 && options.proxy_use_fdpass) fatal("ProxyCommand=- and ProxyUseFDPass are incompatible"); - if (options.control_persist && + if (options.control_persist && options.control_path != NULL && options.update_hostkeys == SSH_UPDATE_HOSTKEYS_ASK) { debug("UpdateHostKeys=ask is incompatible with ControlPersist; " "disabling"); |