From 72a8e501f778fe56e3ec3c32d99f77e20b9b24be Mon Sep 17 00:00:00 2001
From: des <des@FreeBSD.org>
Date: Sat, 29 Jun 2002 11:48:59 +0000
Subject: Resolve conflicts.

Sponsored by:	DARPA, NAI Labs
---
 crypto/openssh/serverloop.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'crypto/openssh/serverloop.c')

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();
-- 
cgit v1.1