summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-05-29 21:42:31 +1000
committerDamien Miller <djm@mindrot.org>2011-05-29 21:42:31 +1000
commit295ee63ab2123899fb21f76616ef4dac51515236 (patch)
treeabfdff06f36b5d5cc32296b53e34c8084f342a9a /ChangeLog
parent04bb56ef10bca3219010fdb191f1f9941353174b (diff)
downloadopenssh-git-295ee63ab2123899fb21f76616ef4dac51515236.tar.gz
- djm@cvs.openbsd.org 2011/05/24 07:15:47
[readconf.c readconf.h ssh.c ssh_config.5 sshconnect.c sshconnect2.c] Remove undocumented legacy options UserKnownHostsFile2 and GlobalKnownHostsFile2 by making UserKnownHostsFile/GlobalKnownHostsFile accept multiple paths per line and making their defaults include known_hosts2; ok markus
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f3f43a13..c7db4a5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,12 @@
read in key comments for v.2 keys (though note that these are not
passed over the agent protocol); bz#439, based on patch from binder
AT arago.de; ok markus@
+ - djm@cvs.openbsd.org 2011/05/24 07:15:47
+ [readconf.c readconf.h ssh.c ssh_config.5 sshconnect.c sshconnect2.c]
+ Remove undocumented legacy options UserKnownHostsFile2 and
+ GlobalKnownHostsFile2 by making UserKnownHostsFile/GlobalKnownHostsFile
+ accept multiple paths per line and making their defaults include
+ known_hosts2; ok markus
20110520
- (djm) [session.c] call setexeccon() before executing passwd for pw