diff options
author | 2016-01-14 16:17:39 +0000 | |
---|---|---|
committer | 2016-01-14 16:17:39 +0000 | |
commit | 9068ae8f34fcab1e99ad6c37c2ef9ca5e0586ef5 (patch) | |
tree | bee8b7dbe30f8012dc57614541fcefc69749036a /usr.bin/ssh/sshconnect2.c | |
parent | Kill unused variable 'lfile'. (diff) | |
download | wireguard-openbsd-9068ae8f34fcab1e99ad6c37c2ef9ca5e0586ef5.tar.xz wireguard-openbsd-9068ae8f34fcab1e99ad6c37c2ef9ca5e0586ef5.zip |
remove roaming support; ok djm@
Diffstat (limited to 'usr.bin/ssh/sshconnect2.c')
-rw-r--r-- | usr.bin/ssh/sshconnect2.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c index 1dd67cf34f7..55c1b49f750 100644 --- a/usr.bin/ssh/sshconnect2.c +++ b/usr.bin/ssh/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.235 2015/12/11 02:31:47 mmcc Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.236 2016/01/14 16:17:40 markus Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved. @@ -211,10 +211,6 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port) dispatch_run(DISPATCH_BLOCK, &kex->done, active_state); - if (options.use_roaming && !kex->roaming) { - debug("Roaming not allowed by server"); - options.use_roaming = 0; - } /* remove ext-info from the KEX proposals for rekeying */ myproposal[PROPOSAL_KEX_ALGS] = compat_kex_proposal(options.kex_algorithms); |