diff options
author | markus@openbsd.org <markus@openbsd.org> | 2016-01-14 16:17:39 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-01-27 16:54:10 +1100 |
commit | a306863831c57ec5fad918687cc5d289ee8e2635 (patch) | |
tree | 0321a74bc4a9be03ad303d35306555ca0908ee25 /sshconnect2.c | |
parent | 6ef49e83e30688504552ac10875feabd5521565f (diff) |
upstream commit
remove roaming support; ok djm@
Upstream-ID: 2cab8f4b197bc95776fb1c8dc2859dad0c64dc56
Diffstat (limited to 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 6c79a7920..1f918533f 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect2.c,v 1.235 2015/12/11 02:31:47 mmcc Exp $ */ | 1 | /* $OpenBSD: sshconnect2.c,v 1.236 2016/01/14 16:17:40 markus 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. |
@@ -219,10 +219,6 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port) | |||
219 | 219 | ||
220 | dispatch_run(DISPATCH_BLOCK, &kex->done, active_state); | 220 | dispatch_run(DISPATCH_BLOCK, &kex->done, active_state); |
221 | 221 | ||
222 | if (options.use_roaming && !kex->roaming) { | ||
223 | debug("Roaming not allowed by server"); | ||
224 | options.use_roaming = 0; | ||
225 | } | ||
226 | /* remove ext-info from the KEX proposals for rekeying */ | 222 | /* remove ext-info from the KEX proposals for rekeying */ |
227 | myproposal[PROPOSAL_KEX_ALGS] = | 223 | myproposal[PROPOSAL_KEX_ALGS] = |
228 | compat_kex_proposal(options.kex_algorithms); | 224 | compat_kex_proposal(options.kex_algorithms); |