From 278f907a2d6d00d6f52a11bf9577648aadbf0994 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 21 Dec 2001 15:00:19 +1100 Subject: - djm@cvs.openbsd.org 2001/12/20 22:50:24 [auth2.c auth2-chall.c channels.c channels.h clientloop.c dispatch.c] [dispatch.h kex.c kex.h packet.c packet.h serverloop.c ssh.c] [sshconnect2.c] Conformance fix: we should send failing packet sequence number when responding with a SSH_MSG_UNIMPLEMENTED message. Spotted by yakk@yakk.dot.net; ok markus@ --- serverloop.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'serverloop.c') diff --git a/serverloop.c b/serverloop.c index c876dc0ca..0754fe76f 100644 --- a/serverloop.c +++ b/serverloop.c @@ -35,7 +35,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: serverloop.c,v 1.87 2001/12/19 16:09:39 markus Exp $"); +RCSID("$OpenBSD: serverloop.c,v 1.88 2001/12/20 22:50:24 djm Exp $"); #include "xmalloc.h" #include "packet.h" @@ -791,7 +791,7 @@ server_loop2(Authctxt *authctxt) } static void -server_input_channel_failure(int type, int plen, void *ctxt) +server_input_channel_failure(int type, int plen, u_int32_t seq, void *ctxt) { debug("Got CHANNEL_FAILURE for keepalive"); /* @@ -804,7 +804,7 @@ server_input_channel_failure(int type, int plen, void *ctxt) static void -server_input_stdin_data(int type, int plen, void *ctxt) +server_input_stdin_data(int type, int plen, u_int32_t seq, void *ctxt) { char *data; u_int data_len; @@ -821,7 +821,7 @@ server_input_stdin_data(int type, int plen, void *ctxt) } static void -server_input_eof(int type, int plen, void *ctxt) +server_input_eof(int type, int plen, u_int32_t seq, void *ctxt) { /* * Eof from the client. The stdin descriptor to the @@ -834,7 +834,7 @@ server_input_eof(int type, int plen, void *ctxt) } static void -server_input_window_size(int type, int plen, void *ctxt) +server_input_window_size(int type, int plen, u_int32_t seq, void *ctxt) { int row = packet_get_int(); int col = packet_get_int(); @@ -912,7 +912,7 @@ server_request_session(char *ctype) } static void -server_input_channel_open(int type, int plen, void *ctxt) +server_input_channel_open(int type, int plen, u_int32_t seq, void *ctxt) { Channel *c = NULL; char *ctype; @@ -962,7 +962,7 @@ server_input_channel_open(int type, int plen, void *ctxt) } static void -server_input_global_request(int type, int plen, void *ctxt) +server_input_global_request(int type, int plen, u_int32_t seq, void *ctxt) { char *rtype; int want_reply; -- cgit v1.2.3