diff options
| author | des <des@FreeBSD.org> | 2002-06-29 11:48:59 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2002-06-29 11:48:59 +0000 |
| commit | 72a8e501f778fe56e3ec3c32d99f77e20b9b24be (patch) | |
| tree | 038040484c6082020b918a9c208a38e77fd09e7d /crypto/openssh/serverloop.c | |
| parent | 96f831106bfe6170a73a8112d39a8b123156c6f2 (diff) | |
| download | FreeBSD-src-72a8e501f778fe56e3ec3c32d99f77e20b9b24be.zip FreeBSD-src-72a8e501f778fe56e3ec3c32d99f77e20b9b24be.tar.gz | |
Resolve conflicts.
Sponsored by: DARPA, NAI Labs
Diffstat (limited to 'crypto/openssh/serverloop.c')
| -rw-r--r-- | crypto/openssh/serverloop.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crypto/openssh/serverloop.c b/crypto/openssh/serverloop.c index 1a148fc..649e4ee 100644 --- a/crypto/openssh/serverloop.c +++ b/crypto/openssh/serverloop.c @@ -35,7 +35,8 @@ */ #include "includes.h" -RCSID("$OpenBSD: serverloop.c,v 1.102 2002/06/11 05:46:20 mpech Exp $"); +RCSID("$OpenBSD: serverloop.c,v 1.103 2002/06/24 14:33:27 markus Exp $"); +RCSID("$FreeBSD$"); #include "xmalloc.h" #include "packet.h" @@ -902,10 +903,8 @@ server_input_channel_open(int type, u_int32_t seq, void *ctxt) { Channel *c = NULL; char *ctype; - u_int len; int rchan; - int rmaxpack; - int rwindow; + u_int rmaxpack, rwindow, len; ctype = packet_get_string(&len); rchan = packet_get_int(); |
