From owner-cvs-all@FreeBSD.ORG  Sat Sep 27 06:50:48 2003
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 B3ED516A4B3; Sat, 27 Sep 2003 06:50:48 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 476B243F93; Sat, 27 Sep 2003 06:50:48 -0700 (PDT)
	(envelope-from mux@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8RDomXJ035974;
	Sat, 27 Sep 2003 06:50:48 -0700 (PDT)
	(envelope-from mux@repoman.freebsd.org)
Received: (from mux@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8RDolwx035973;
	Sat, 27 Sep 2003 06:50:47 -0700 (PDT)
	(envelope-from mux)
Message-Id: <200309271350.h8RDolwx035973@repoman.freebsd.org>
From: Maxime Henrion <mux@FreeBSD.org>
Date: Sat, 27 Sep 2003 06:50:47 -0700 (PDT)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/etc/rc.d ipfilter
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: Sat, 27 Sep 2003 13:50:48 -0000

mux         2003/09/27 06:50:47 PDT

  FreeBSD src repository

  Modified files:
    etc/rc.d             ipfilter 
  Log:
  A number of fixes/enhancements for the ipfilter rc script:
  - Use a more robust check to determine if we need to load ipl.ko.
  - Don't try to run ipf -E if ipfilter is already enabled.  Look at
    the net.inet.ipf.fr_running sysctl to figure this out.  This fixes
    a warning message about ipfilter being already initialized.
  - Only one ipf -E command is needed.  We don't need an extra one for
    the -6 case which would only print a warning message about ipfilter
    being already initialized.
  - Fix one occurence where we were running /sbin/ipf directly without
    using the ${ipfilter_program} variable if set.
  - In ipfilter_stop(), don't try to save the firewall state tables if
    ipfilter is disabled.  Similarly, don't try to disable it if it's
    already disabled.  This fixes some more error messages.
  
  Revision  Changes    Path
  1.12      +22 -15    src/etc/rc.d/ipfilter