diff options
author | Damien Miller <djm@mindrot.org> | 2011-05-29 21:42:31 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2011-05-29 21:42:31 +1000 |
commit | 295ee63ab2123899fb21f76616ef4dac51515236 (patch) | |
tree | abfdff06f36b5d5cc32296b53e34c8084f342a9a /sshconnect2.c | |
parent | 04bb56ef10bca3219010fdb191f1f9941353174b (diff) |
- 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 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 673bf1a4f..c24b20278 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect2.c,v 1.187 2011/05/06 02:05:41 djm Exp $ */ | 1 | /* $OpenBSD: sshconnect2.c,v 1.188 2011/05/24 07:15:47 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2008 Damien Miller. All rights reserved. |
@@ -109,14 +109,15 @@ order_hostkeyalgs(char *host, struct sockaddr *hostaddr, u_short port) | |||
109 | size_t maxlen; | 109 | size_t maxlen; |
110 | struct hostkeys *hostkeys; | 110 | struct hostkeys *hostkeys; |
111 | int ktype; | 111 | int ktype; |
112 | u_int i; | ||
112 | 113 | ||
113 | /* Find all hostkeys for this hostname */ | 114 | /* Find all hostkeys for this hostname */ |
114 | get_hostfile_hostname_ipaddr(host, hostaddr, port, &hostname, NULL); | 115 | get_hostfile_hostname_ipaddr(host, hostaddr, port, &hostname, NULL); |
115 | hostkeys = init_hostkeys(); | 116 | hostkeys = init_hostkeys(); |
116 | load_hostkeys(hostkeys, hostname, options.user_hostfile2); | 117 | for (i = 0; i < options.num_user_hostfiles; i++) |
117 | load_hostkeys(hostkeys, hostname, options.system_hostfile2); | 118 | load_hostkeys(hostkeys, hostname, options.user_hostfiles[i]); |
118 | load_hostkeys(hostkeys, hostname, options.user_hostfile); | 119 | for (i = 0; i < options.num_system_hostfiles; i++) |
119 | load_hostkeys(hostkeys, hostname, options.system_hostfile); | 120 | load_hostkeys(hostkeys, hostname, options.system_hostfiles[i]); |
120 | 121 | ||
121 | oavail = avail = xstrdup(KEX_DEFAULT_PK_ALG); | 122 | oavail = avail = xstrdup(KEX_DEFAULT_PK_ALG); |
122 | maxlen = strlen(avail) + 1; | 123 | maxlen = strlen(avail) + 1; |