diff options
| author | Andreas Gunnarsson <andreas@cvs.openbsd.org> | 2009-10-24 11:13:55 +0000 |
|---|---|---|
| committer | Andreas Gunnarsson <andreas@cvs.openbsd.org> | 2009-10-24 11:13:55 +0000 |
| commit | e4134ba32930da714d7b5b73be87ff8303cb872a (patch) | |
| tree | 9ef77c969a5284069702b64fd5165f823869bb2f /usr.bin/ssh/sshconnect2.c | |
| parent | 554435969f9a5148bbff1261bfd518da82f23f2f (diff) | |
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.c | 7 |
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; |