From owner-cvs-all@FreeBSD.ORG  Thu Jun 17 17:00:39 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 46FC016A4CF; Thu, 17 Jun 2004 17:00:39 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 282B343D1F; Thu, 17 Jun 2004 17:00:39 +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 i5HGxlK5037576;
	Thu, 17 Jun 2004 16:59:47 GMT
	(envelope-from mlaier@repoman.freebsd.org)
Received: (from mlaier@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5HGxl4Y037575;
	Thu, 17 Jun 2004 16:59:47 GMT
	(envelope-from mlaier)
Message-Id: <200406171659.i5HGxl4Y037575@repoman.freebsd.org>
From: Max Laier <mlaier@FreeBSD.org>
Date: Thu, 17 Jun 2004 16:59:47 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/contrib/pf/net pf.c pf_ioctl.c pf_norm.c
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, 17 Jun 2004 17:00:39 -0000

mlaier      2004-06-17 16:59:47 UTC

  FreeBSD src repository

  Modified files:
    sys/contrib/pf/net   pf.c pf_ioctl.c pf_norm.c 
  Log:
  Import two fixes from the OpenBSD stable branch:
   - prevent an endless loop with route-to lo0, fixes PR 3736 (dhartmei@)
   - The rule_number parameter for pf_get_pool() needs to be 32 bits, not 8 -
     this fixes corruption of the address pools with large rulesets.
     (mcbride@, pb@)
  
  Reviewed-by:    dhartmei
  
  Revision  Changes    Path
  1.11      +8 -11     src/sys/contrib/pf/net/pf.c
  1.11      +3 -3      src/sys/contrib/pf/net/pf_ioctl.c
  1.7       +5 -5      src/sys/contrib/pf/net/pf_norm.c