> 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 <d...@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                                                 rgri...@freebsd.org
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to