From owner-cvs-all@FreeBSD.ORG  Thu Sep 30 20:11:47 2004
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 32EF516A4CE; Thu, 30 Sep 2004 20:11:47 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 127C743D45; Thu, 30 Sep 2004 20:11:47 +0000 (GMT)
	(envelope-from mlaier@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8UKBkft050668;
	Thu, 30 Sep 2004 20:11:46 GMT
	(envelope-from mlaier@repoman.freebsd.org)
Received: (from mlaier@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8UKBkpj050667;
	Thu, 30 Sep 2004 20:11:46 GMT
	(envelope-from mlaier)
Message-Id: <200409302011.i8UKBkpj050667@repoman.freebsd.org>
From: Max Laier <mlaier@FreeBSD.org>
Date: Thu, 30 Sep 2004 20:11:46 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_5
Subject: cvs commit: src/sys/netipsec keydb.h src/sys/contrib/pf/net
 pfvar.h
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Sep 2004 20:11:47 -0000

mlaier      2004-09-30 20:11:46 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_5)
    sys/netipsec         keydb.h 
    sys/contrib/pf/net   pfvar.h 
  Log:
  MFC from pfvar.h, rev. 1.9 and keydb.h, rev. 1.4
  >   Protect sockaddr_union definitions with a protecting define. This allows
  >   to build kernels with FAST_IPSEC and PF. This is the least disruptive
  >   fix.
  >
  >   PR:             kern/71836
  >   Reviewed by:    bms, various mailing lists
  
  Approved by:    re (scottl)
  
  Revision  Changes    Path
  1.8.2.1   +9 -10     src/sys/contrib/pf/net/pfvar.h
  1.3.4.1   +3 -0      src/sys/netipsec/keydb.h