diff options
| author | markus@openbsd.org <markus@openbsd.org> | 2015-01-19 20:16:15 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-01-20 09:19:39 +1100 |
| commit | 57d10cbe861a235dd269c74fb2fe248469ecee9d (patch) | |
| tree | c65deed24700490bd3b20300c4829d4d5466ff6d /serverloop.c | |
| parent | 3fdc88a0def4f86aa88a5846ac079dc964c0546a (diff) | |
upstream commit
adapt kex to sshbuf and struct ssh; ok djm@
Diffstat (limited to 'serverloop.c')
| -rw-r--r-- | serverloop.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/serverloop.c b/serverloop.c index edf6a813..83a1e010 100644 --- a/serverloop.c +++ b/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 @@ -544,7 +544,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); } /* @@ -874,7 +874,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); |