diff options
author | Damien Miller <djm@mindrot.org> | 2013-10-17 11:47:23 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-10-17 11:47:23 +1100 |
commit | 0faf747e2f77f0f7083bcd59cbed30c4b5448444 (patch) | |
tree | 1f1b80f60be01d61f284070affc314d1b97b6b69 /roaming_client.c | |
parent | d77b81f856e078714ec6b0f86f61c20249b7ead4 (diff) |
- djm@cvs.openbsd.org 2013/10/16 02:31:47
[readconf.c readconf.h roaming_client.c ssh.1 ssh.c ssh_config.5]
[sshconnect.c sshconnect.h]
Implement client-side hostname canonicalisation to allow an explicit
search path of domain suffixes to use to convert unqualified host names
to fully-qualified ones for host key matching.
This is particularly useful for host certificates, which would otherwise
need to list unqualified names alongside fully-qualified ones (and this
causes a number of problems).
"looks fine" markus@
Diffstat (limited to 'roaming_client.c')
-rw-r--r-- | roaming_client.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/roaming_client.c b/roaming_client.c index 81c496827..2fb623121 100644 --- a/roaming_client.c +++ b/roaming_client.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: roaming_client.c,v 1.5 2013/05/17 00:13:14 djm Exp $ */ | 1 | /* $OpenBSD: roaming_client.c,v 1.6 2013/10/16 02:31:46 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2004-2009 AppGate Network Security AB | 3 | * Copyright (c) 2004-2009 AppGate Network Security AB |
4 | * | 4 | * |
@@ -259,10 +259,10 @@ wait_for_roaming_reconnect(void) | |||
259 | if (c != '\n' && c != '\r') | 259 | if (c != '\n' && c != '\r') |
260 | continue; | 260 | continue; |
261 | 261 | ||
262 | if (ssh_connect(host, &hostaddr, options.port, | 262 | if (ssh_connect(host, NULL, &hostaddr, options.port, |
263 | options.address_family, 1, &timeout_ms, | 263 | options.address_family, 1, &timeout_ms, |
264 | options.tcp_keep_alive, options.use_privileged_port, | 264 | options.tcp_keep_alive, options.use_privileged_port) == 0 && |
265 | options.proxy_command) == 0 && roaming_resume() == 0) { | 265 | roaming_resume() == 0) { |
266 | packet_restore_state(); | 266 | packet_restore_state(); |
267 | reenter_guard = 0; | 267 | reenter_guard = 0; |
268 | fprintf(stderr, "[connection resumed]\n"); | 268 | fprintf(stderr, "[connection resumed]\n"); |