From owner-cvs-src@FreeBSD.ORG  Tue Apr  6 03:02:52 2004
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 064AF16A4CE; Tue,  6 Apr 2004 03:02:52 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id BC8A243D58; Tue,  6 Apr 2004 03:02:51 -0700 (PDT)
	(envelope-from bms@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i36A2CGe093919;
	Tue, 6 Apr 2004 03:02:12 -0700 (PDT)
	(envelope-from bms@repoman.freebsd.org)
Received: (from bms@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i36A2Chi093915;
	Tue, 6 Apr 2004 03:02:12 -0700 (PDT)
	(envelope-from bms)
Message-Id: <200404061002.i36A2Chi093915@repoman.freebsd.org>
From: Bruce M Simpson <bms@FreeBSD.org>
Date: Tue, 6 Apr 2004 03:02:12 -0700 (PDT)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_4
Subject: cvs commit: src/usr.sbin/setkey parse.y
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Apr 2004 10:02:52 -0000

bms         2004/04/06 03:02:12 PDT

  FreeBSD src repository

  Modified files:        (Branch: RELENG_4)
    usr.sbin/setkey      parse.y 
  Log:
  MFC: Fix regression in setkey whereby parser would fail to recognise tcp
  as both a security protocol and an upper level protocol for encapsulation.
  
  PR:             bin/63616
  Submitted by:   ume@
  
  Revision  Changes    Path
  1.1.2.4   +1 -0      src/usr.sbin/setkey/parse.y