openssh compile problem in channels.c

[Nate Lawson]

Others have reported this before.  It was not filesystem corruption.
I've had this for a while on one of my machines and finally investigated.
It looks like cvs repo surgery screwed it up at one point.  I fixed it by
rming channels.c,v and re-cvsupping.  Just in case any one is curious what
happened, here is the diff between what I had and the good cvs file:

--- /home/nate/channels.c,v	Fri Feb 27 10:30:40 2004
+++ channels.c,v	Thu Feb 26 02:38:50 2004
@@ -1,4 +1,5 @@
-head	1.16;
+head	1.15;
+branch	1.1.1;
 access;
 symbols
 	OpenSSH_3_8p1:1.1.1.16
@@ -63,11 +64,6 @@
 comment	@ * @;


-1.16
-date	2003.09.17.00.58.33;	author nectar;	state Exp;
-branches;
-next	1.15;
-
 1.15
 date	2003.05.01.15.05.42;	author des;	state Exp;
 branches
@@ -348,11 +344,9 @@
 @@


-1.16
+1.15
 log
- at Additional corrections to OpenSSH buffer handling.
-
-Obtained from:	openssh.org
+ at Remove RCSID from files which have no other diffs to the vendor branch.
 @
 text
 @/*
@@ -586,13 +580,12 @@
 	if (found == -1) {
 		/* There are no free slots.  Take last+1 slot and expand the array.  */
 		found = channels_alloc;
+		channels_alloc += 10;
 		if (channels_alloc > 10000)
 			fatal("channel_new: internal error: channels_alloc %d "
 			    "too big.", channels_alloc);
-		channels = xrealloc(channels,
-		    (channels_alloc + 10) * sizeof(Channel *));
-		channels_alloc += 10;
 		debug2("channel: expanding %d", channels_alloc);
+		channels = xrealloc(channels, channels_alloc * sizeof(Channel *));
 		for (i = found; i < channels_alloc; i++)
 			channels[i] = NULL;
 	}
@@ -3127,19 +3120,6 @@
 	}
 	packet_send();
 }
-@
-
-
-1.15
-log
- at Remove RCSID from files which have no other diffs to the vendor branch.
-@
-text
- at a231 1
-		channels_alloc += 10;
-d235 3
-a238 1
-		channels = xrealloc(channels, channels_alloc * sizeof(Channel *));
 @