From owner-svn-src-all@FreeBSD.ORG  Tue Apr  7 16:29:50 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 832601065670;
	Tue,  7 Apr 2009 16:29:50 +0000 (UTC)
	(envelope-from emax@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 705E48FC14;
	Tue,  7 Apr 2009 16:29:50 +0000 (UTC)
	(envelope-from emax@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n37GToIA014361;
	Tue, 7 Apr 2009 16:29:50 GMT (envelope-from emax@svn.freebsd.org)
Received: (from emax@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n37GTowo014360;
	Tue, 7 Apr 2009 16:29:50 GMT (envelope-from emax@svn.freebsd.org)
Message-Id: <200904071629.n37GTowo014360@svn.freebsd.org>
From: Maksim Yevmenkin <emax@FreeBSD.org>
Date: Tue, 7 Apr 2009 16:29:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r190808 - stable/7/etc/rc.d
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Apr 2009 16:29:51 -0000

Author: emax
Date: Tue Apr  7 16:29:50 2009
New Revision: 190808
URL: http://svn.freebsd.org/changeset/base/190808

Log:
  MFC r190575
  
  - Add ipfw_nat to the list of required modules if "firewall_nat_enable"
    is set and "natd_enable" is NOT set;
  
  - Accept and pass firewall type to the external firewall script.
  
  Submitted by:		Yuri Kurenkov < y -dot- kurenkov -at- init -dot- ru >
  No response from:	freebsd-rc
  Approved by:		re (kib)

Modified:
  stable/7/etc/rc.d/   (props changed)
  stable/7/etc/rc.d/ipfw

Modified: stable/7/etc/rc.d/ipfw
==============================================================================
--- stable/7/etc/rc.d/ipfw	Tue Apr  7 16:15:59 2009	(r190807)
+++ stable/7/etc/rc.d/ipfw	Tue Apr  7 16:29:50 2009	(r190808)
@@ -23,10 +23,20 @@ ipfw_prestart()
 	if checkyesno dummynet_enable; then
 		required_modules="$required_modules dummynet"
 	fi
+
+	if checkyesno firewall_nat_enable; then
+		if ! checkyesno natd_enable; then
+			required_modules="$required_modules ipfw_nat"
+		fi
+	fi 
 }
 
 ipfw_start()
 {
+	local   _firewall_type
+
+	_firewall_type=$1 
+
 	# set the firewall rules script if none was specified
 	[ -z "${firewall_script}" ] && firewall_script=/etc/rc.firewall
 
@@ -34,7 +44,7 @@ ipfw_start()
 		if [ -f /etc/rc.d/natd ] ; then
 			/etc/rc.d/natd start
 		fi
-		/bin/sh "${firewall_script}"
+		/bin/sh "${firewall_script}" "${_firewall_type}"
 		echo 'Firewall rules loaded.'
 	elif [ "`ipfw list 65535`" = "65535 deny ip from any to any" ]; then
 		echo 'Warning: kernel has firewall functionality, but' \
@@ -65,4 +75,4 @@ ipfw_stop()
 }
 
 load_rc_config $name
-run_rc_command "$1"
+run_rc_command $*