summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/sshconnect2.c
diff options
context:
space:
mode:
authorandreas <andreas@openbsd.org>2009-10-24 11:13:54 +0000
committerandreas <andreas@openbsd.org>2009-10-24 11:13:54 +0000
commit33d8796839c486d9acf013c85749f7db81215d24 (patch)
treeea6b5298e4a5a61e19a8953f52a126036c7f14c5 /usr.bin/ssh/sshconnect2.c
parentDeclarations needed for upcoming changes. (diff)
downloadwireguard-openbsd-33d8796839c486d9acf013c85749f7db81215d24.tar.xz
wireguard-openbsd-33d8796839c486d9acf013c85749f7db81215d24.zip
Let the client detect if the server supports roaming by looking
for the resume@appgate.com kex algorithm. ok markus@
Diffstat (limited to 'usr.bin/ssh/sshconnect2.c')
-rw-r--r--usr.bin/ssh/sshconnect2.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c
index cb0ce0915e2..0445a0fb0e6 100644
--- a/usr.bin/ssh/sshconnect2.c
+++ b/usr.bin/ssh/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.172 2009/10/23 01:57:11 djm Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.173 2009/10/24 11:13:54 andreas Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Damien Miller. All rights reserved.
@@ -146,6 +146,11 @@ ssh_kex2(char *host, struct sockaddr *hostaddr)
dispatch_run(DISPATCH_BLOCK, &kex->done, kex);
+ if (options.use_roaming && !kex->roaming) {
+ debug("Roaming not allowed by server");
+ options.use_roaming = 0;
+ }
+
session_id2 = kex->session_id;
session_id2_len = kex->session_id_len;