From owner-freebsd-current@FreeBSD.ORG Fri Feb 27 12:15:33 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 09A1516A4CE for ; Fri, 27 Feb 2004 12:15:33 -0800 (PST) Received: from root.org (root.org [67.118.192.226]) by mx1.FreeBSD.org (Postfix) with SMTP id BFC3743D31 for ; Fri, 27 Feb 2004 12:15:32 -0800 (PST) (envelope-from nate@root.org) Received: (qmail 86730 invoked by uid 1000); 27 Feb 2004 20:15:33 -0000 Date: Fri, 27 Feb 2004 12:15:33 -0800 (PST) From: Nate Lawson To: current@freebsd.org Message-ID: <20040227121245.X86727@root.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Subject: openssh compile problem in channels.c X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Feb 2004 20:15:33 -0000 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 -@Additional corrections to OpenSSH buffer handling. - -Obtained from: openssh.org +@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 -@Remove RCSID from files which have no other diffs to the vendor branch. -@ -text -@a231 1 - channels_alloc += 10; -d235 3 -a238 1 - channels = xrealloc(channels, channels_alloc * sizeof(Channel *)); @