diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2010-01-08 06:50:41 +0100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2010-01-08 06:50:41 +0100 |
| commit | 36331b5d6cf8f776a27fe6fc3ed19da4f4c2ad91 (patch) | |
| tree | baa7665a21214b1f80dbd9e3df2afcfffe0c2ebf /sshconnect2.c | |
| parent | - andreas@cvs.openbsd.org 2009/10/24 11:11:58 (diff) | |
| download | openssh-36331b5d6cf8f776a27fe6fc3ed19da4f4c2ad91.tar.xz openssh-36331b5d6cf8f776a27fe6fc3ed19da4f4c2ad91.zip | |
- andreas@cvs.openbsd.org 2009/10/24 11:13:54
[sshconnect2.c kex.h kex.c]
Let the client detect if the server supports roaming by looking
for the resume@appgate.com kex algorithm.
ok markus@
Diffstat (limited to 'sshconnect2.c')
| -rw-r--r-- | sshconnect2.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 1e0e9d5e1..937bb773d 100644 --- a/sshconnect2.c +++ b/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. @@ -152,6 +152,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; |