Date: Thu, 29 Mar 2018 14:17:03 +0000 From: Marcelo Araujo <araujobsdport@gmail.com> To: "Rodney W. Grimes" <rgrimes@freebsd.org> Cc: Marcelo Araujo <araujo@freebsd.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: Re: svn commit: r331728 - in stable/11/etc: . rc.d Message-ID: <CAOfEmZiipuVe=fb8y08DcZDRdBiExWOuq4HJcfOsGBKJc63Qfg@mail.gmail.com> In-Reply-To: <201803291320.w2TDKej2063088@pdx.rh.CN85.dnsmgr.net> References: <201803290451.w2T4p8NK035072@repo.freebsd.org> <201803291320.w2TDKej2063088@pdx.rh.CN85.dnsmgr.net>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, Mar 29, 2018, 9:20 PM Rodney W. Grimes < freebsd@pdx.rh.cn85.dnsmgr.net> wrote: > > Author: araujo > > Date: Thu Mar 29 04:51:07 2018 > > New Revision: 331728 > > URL: https://svnweb.freebsd.org/changeset/base/331728 > > > > Log: > > MFC r329817: > > I must of missed this when it landed in ^/head > No you didn't! But for every each commit you send a reply, so I did missed it checking all the emails traffic. > > 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> > > Sponsored by: iXsystems Inc. > > Differential Revision: https://reviews.freebsd.org/D14286 > > No one accepted it :-(. > I was the reviewer if you didn't notice! > > Modified: > > stable/11/etc/rc.d/ipfw > > stable/11/etc/rc.firewall > > Directory Properties: > > stable/11/ (props changed) > > > > Modified: stable/11/etc/rc.d/ipfw > > > ============================================================================== > > --- stable/11/etc/rc.d/ipfw Thu Mar 29 04:41:45 2018 (r331727) > > +++ stable/11/etc/rc.d/ipfw Thu Mar 29 04:51:07 2018 (r331728) > > @@ -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: stable/11/etc/rc.firewall > > > ============================================================================== > > --- stable/11/etc/rc.firewall Thu Mar 29 04:41:45 2018 (r331727) > > +++ stable/11/etc/rc.firewall Thu Mar 29 04:51:07 2018 (r331728) > > @@ -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 > > firewall_rc_config_load is undocumented and missing from > /etc/defaults/rc.conf. If you have time, it is a good opportunity to send a patch, I can review it, otherwise I will fix it this week or next. Thanks. > > > > -. /etc/rc.subr > > -. /etc/network.subr > > afexists inet6 > > ipv6_available=$? > > -- > Rod Grimes > rgrimes@freebsd.org >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAOfEmZiipuVe=fb8y08DcZDRdBiExWOuq4HJcfOsGBKJc63Qfg>