From owner-svn-src-head@freebsd.org  Thu Feb 22 14:38:07 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 93546F093C6;
 Thu, 22 Feb 2018 14:38:07 +0000 (UTC)
 (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net)
Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id EAA318676F;
 Thu, 22 Feb 2018 14:38:06 +0000 (UTC)
 (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net)
Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1])
 by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id w1MEc45x091594;
 Thu, 22 Feb 2018 06:38:04 -0800 (PST)
 (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net)
Received: (from freebsd@localhost)
 by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id w1MEc4am091593;
 Thu, 22 Feb 2018 06:38:04 -0800 (PST) (envelope-from freebsd)
From: "Rodney W. Grimes" <freebsd@pdx.rh.CN85.dnsmgr.net>
Message-Id: <201802221438.w1MEc4am091593@pdx.rh.CN85.dnsmgr.net>
Subject: Re: svn commit: r329817 - in head/etc: . rc.d
In-Reply-To: <201802220825.w1M8PeqT049430@repo.freebsd.org>
To: Marcelo Araujo <araujo@freebsd.org>
Date: Thu, 22 Feb 2018 06:38:04 -0800 (PST)
CC: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Reply-To: rgrimes@freebsd.org
X-Mailer: ELM [version 2.4ME+ PL121h (25)]
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=US-ASCII
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Feb 2018 14:38:07 -0000

> Author: araujo
> Date: Thu Feb 22 08:25:39 2018
> New Revision: 329817
> URL: https://svnweb.freebsd.org/changeset/base/329817
> 
> Log:
>   The firewall_type is ignored if not set in rc.conf or rc.conf.local,
>   after r190575 there is an option to call rc.firewall with the firewall_type
>   passed in as an argument.
>   
>   Submitted by:	David P. Discher <dpd@dpdtech.com>
>   MFC after:	3 weeks.
>   Sponsored by:	iXsystems Inc.
>   Differential Revision:	https://reviews.freebsd.org/D14286
> 
> Modified:
>   head/etc/rc.d/ipfw
>   head/etc/rc.firewall
> 
> Modified: head/etc/rc.d/ipfw
> ==============================================================================
> --- head/etc/rc.d/ipfw	Thu Feb 22 05:44:00 2018	(r329816)
> +++ head/etc/rc.d/ipfw	Thu Feb 22 08:25:39 2018	(r329817)
> @@ -40,7 +40,11 @@ ipfw_start()
>  {
>  	local   _firewall_type
>  
> -	_firewall_type=$1
> +	if [ -n "${1}" ]; then
> +		_firewall_type=$1
> +	else
> +		_firewall_type=${firewall_type}
> +	fi
>  
>  	# set the firewall rules script if none was specified
>  	[ -z "${firewall_script}" ] && firewall_script=/etc/rc.firewall
> 
> Modified: head/etc/rc.firewall
> ==============================================================================
> --- head/etc/rc.firewall	Thu Feb 22 05:44:00 2018	(r329816)
> +++ head/etc/rc.firewall	Thu Feb 22 08:25:39 2018	(r329817)
> @@ -112,12 +112,20 @@ setup_ipv6_mandatory() {
>  	${fwcmd} add pass ipv6-icmp from any to any icmp6types 2,135,136
>  }
>  
> +. /etc/rc.subr
> +. /etc/network.subr
> +
>  if [ -n "${1}" ]; then
>  	firewall_type="${1}"
>  fi
> +if [ -z "${firewall_rc_config_load}" ]; then
> +        load_rc_config ipfw
> +else
> +        for i in ${firewall_rc_config_load}; do
> +                load_rc_config $i
> +        done
> +fi

There is no documentation of firewall_rc_config_load.

> -. /etc/rc.subr
> -. /etc/network.subr
>  afexists inet6
>  ipv6_available=$?

-- 
Rod Grimes                                                 rgrimes@freebsd.org