From owner-freebsd-stable@FreeBSD.ORG  Wed May  4 02:07:18 2011
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 688A5106564A
	for <freebsd-stable@freebsd.org>; Wed,  4 May 2011 02:07:18 +0000 (UTC)
	(envelope-from kiri@pis.elm.toba-cmt.ac.jp)
Received: from pis.elm.toba-cmt.ac.jp (pis.elm.toba-cmt.ac.jp [202.26.248.196])
	by mx1.freebsd.org (Postfix) with ESMTP id 16D2B8FC12
	for <freebsd-stable@freebsd.org>; Wed,  4 May 2011 02:07:17 +0000 (UTC)
Received: from kiri.pis.pis.elm.toba-cmt.ac.jp (localhost [127.0.0.1])
	by pis.elm.toba-cmt.ac.jp (8.14.3/8.14.2) with ESMTP id p4427Hs1055072
	for <freebsd-stable@freebsd.org>; Wed, 4 May 2011 11:07:17 +0900 (JST)
	(envelope-from kiri@pis.elm.toba-cmt.ac.jp)
Message-Id: <201105040207.p4427Hs1055072@pis.elm.toba-cmt.ac.jp>
Date: Wed, 04 May 2011 11:07:17 +0900
From: KIRIYAMA Kazuhiko <kiri@pis.elm.toba-cmt.ac.jp>
To: freebsd-stable@freebsd.org
In-Reply-To: <201105040140.p441eClM054591@pis.elm.toba-cmt.ac.jp>
References: <BANLkTik8cAOt1iAP1tOu0EVrRL07uHA8Ng@mail.gmail.com>
	<201105031543.p43Fh92T041708@pis.elm.toba-cmt.ac.jp>
	<20110504030404.O85801@sola.nimnet.asn.au>
	<201105040140.p441eClM054591@pis.elm.toba-cmt.ac.jp>
User-Agent: Wanderlust/2.14.0 (Africa) SEMI/1.14.6 (Maruoka) FLIM/1.14.8
	(=?ISO-8859-4?Q?Shij=F2?=) APEL/10.6 MULE XEmacs/21.4 (patch 21)
	(Educational Television) (i386--freebsd)
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=US-ASCII
Subject: Re: /etc/rc.d/ipfw can't deal with firewall_type?
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>, 
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 May 2011 02:07:18 -0000

At Wed, 04 May 2011 10:40:12 +0900,
My wrote:
> 
> At Wed, 4 May 2011 03:47:02 +1000 (EST),
> Ian Smith wrote:
> > 
> >  > +++ /etc/rc.d/ipfw	2011-05-03 22:08:14.000000000 +0900
> >  > @@ -35,15 +35,11 @@
> >  >  
> >  >  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
> >  >  
> >  >  	if [ -r "${firewall_script}" ]; then
> >  > -		/bin/sh "${firewall_script}" "${_firewall_type}"
> >  > +		/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' \
> 
> For the case of commandline usage, above patch should be modified as
> follows:
> 
> --- /etc/rc.d/ipfw.org	2011-05-03 18:19:28.000000000 +0900
> +++ /etc/rc.d/ipfw	2011-05-04 09:31:09.000000000 +0900
> @@ -37,7 +37,11 @@
>  {
>  	local   _firewall_type
>  
> -	_firewall_type=$1
> +	if [ -n "${1}" ]; then
> +		_firewall_type=$1
> +	elif [ -n "${firewall_type}" ]
> +		_firewall_type=${firewall_type}
> +	fi	
>  
>  	# set the firewall rules script if none was specified
>  	[ -z "${firewall_script}" ] && firewall_script=/etc/rc.firewall

Above patch has typo. Collect one is as follows:

--- /etc/rc.d/ipfw.org	2011-05-03 18:19:28.000000000 +0900
+++ /etc/rc.d/ipfw	2011-05-04 09:53:40.000000000 +0900
@@ -37,7 +37,11 @@
 {
 	local   _firewall_type
 
-	_firewall_type=$1
+	if [ -n "${1}" ]; then
+		_firewall_type=$1
+	elif [ -n "${firewall_type}" ]; then
+		_firewall_type=${firewall_type}
+	fi	
 
 	# set the firewall rules script if none was specified
 	[ -z "${firewall_script}" ] && firewall_script=/etc/rc.firewall