summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/serverloop.c
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>2015-01-19 20:16:15 +0000
committermarkus <markus@openbsd.org>2015-01-19 20:16:15 +0000
commit13202d0a5b85c429328d9bd32567ae8987b64ae9 (patch)
treec01bb573c481577ee0e30bf4f5e3707684c339a3 /usr.bin/ssh/serverloop.c
parent`wellspring' Apple keyboards found on Macbook Air need slightly different (diff)
downloadwireguard-openbsd-13202d0a5b85c429328d9bd32567ae8987b64ae9.tar.xz
wireguard-openbsd-13202d0a5b85c429328d9bd32567ae8987b64ae9.zip
adapt kex to sshbuf and struct ssh; ok djm@
Diffstat (limited to 'usr.bin/ssh/serverloop.c')
-rw-r--r--usr.bin/ssh/serverloop.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c
index 418c9282460..bcf9bcb9d6b 100644
--- a/usr.bin/ssh/serverloop.c
+++ b/usr.bin/ssh/serverloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: serverloop.c,v 1.174 2015/01/19 20:07:45 markus Exp $ */
+/* $OpenBSD: serverloop.c,v 1.175 2015/01/19 20:16:15 markus Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -512,7 +512,7 @@ drain_output(void)
static void
process_buffered_input_packets(void)
{
- dispatch_run(DISPATCH_NONBLOCK, NULL, compat20 ? active_state->kex : NULL);
+ dispatch_run(DISPATCH_NONBLOCK, NULL, active_state);
}
/*
@@ -842,7 +842,7 @@ server_loop2(Authctxt *authctxt)
if (packet_need_rekeying()) {
debug("need rekeying");
active_state->kex->done = 0;
- kex_send_kexinit(active_state->kex);
+ kex_send_kexinit(active_state);
}
}
process_input(readset);