From owner-cvs-all  Tue Jan 23 21:33:25 2001
Delivered-To: cvs-all@freebsd.org
Received: from InterJet.dellroad.org (adsl-63-194-81-26.dsl.snfc21.pacbell.net [63.194.81.26])
	by hub.freebsd.org (Postfix) with ESMTP
	id 7D16337B401; Tue, 23 Jan 2001 21:33:06 -0800 (PST)
Received: from curve.dellroad.org (curve.dellroad.org [10.1.1.30])
	by InterJet.dellroad.org (8.9.1a/8.9.1) with ESMTP id VAA48176;
	Tue, 23 Jan 2001 21:33:05 -0800 (PST)
Received: (from archie@localhost)
	by curve.dellroad.org (8.9.3/8.9.3) id VAA00299;
	Tue, 23 Jan 2001 21:33:05 -0800 (PST)
	(envelope-from archie)
From: Archie Cobbs <archie@dellroad.org>
Message-Id: <200101240533.VAA00299@curve.dellroad.org>
Subject: Re: cvs commit: src/contrib/tcpdump print-smb.c
In-Reply-To: <20010123200157.A25436@citusc17.usc.edu> "from Kris Kennaway at
 Jan 23, 2001 08:01:57 pm"
To: Kris Kennaway <kris@FreeBSD.org>
Date: Tue, 23 Jan 2001 21:33:05 -0800 (PST)
Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
X-Mailer: ELM [version 2.4ME+ PL77 (25)]
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=US-ASCII
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

Kris Kennaway writes:
> >   Modified files:
> >     contrib/tcpdump      print-smb.c 
> >   Log:
> >   Fix bug where tcpdump shows data beyond the end of certain NBT packets.
> >   
> >   Revision  Changes    Path
> >   1.2       +3 -1      src/contrib/tcpdump/print-smb.c
> 
> Congratulations, you just took this file off the vendor branch :-(

Sorry if I'm being obtuse, but how is that a problem? Doesn't CVS
do the right thing in this case? There are lots of other files
in that directory with $FreeBSD$ in them.

> Why couldn't this have been submitted through the tcpdump coders and
> vendor imported when they apply the patch?

I did submit it, just like I've submitted other stuff to them.
I never hear anything back and this time didn't feel like waiting.

If they integrate it, then the next merge will harmonize the two.
If not, then we get to enjoy a non-broken tcpdump in the meantime.

-Archie

___________________________________________________________________________
Archie Cobbs   *   Whistle Communications, Inc.  *   http://www.whistle.com


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message