From owner-svn-src-stable-11@freebsd.org Thu Mar 29 14:17:17 2018 Return-Path: Delivered-To: svn-src-stable-11@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 E22DAF79DCC; Thu, 29 Mar 2018 14:17:16 +0000 (UTC) (envelope-from araujobsdport@gmail.com) Received: from mail-lf0-x232.google.com (mail-lf0-x232.google.com [IPv6:2a00:1450:4010:c07::232]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4EEC0704CE; Thu, 29 Mar 2018 14:17:16 +0000 (UTC) (envelope-from araujobsdport@gmail.com) Received: by mail-lf0-x232.google.com with SMTP id z143-v6so8650905lff.3; Thu, 29 Mar 2018 07:17:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:reply-to:from:date:message-id :subject:to:cc; bh=YzZ+gcY4tc/Mcg4oDnxEr1RZRYt8nHqsxu6pFXmKpdQ=; b=am7D+DuFXF+XhFVjMYt48/Xz0mIwwNMiY5sPVAuXJhz4l4Dd45Siy7eVYWek2FpKsS aPfg+lyzUqGESh00eTcB98sDIicSQUtz0ZDGRlJ0Cy4jjevBp55zkoUu8KRr3BzXT53K qFq+GLeovv3kqT6u/ixuI6NIYQTlhw4IuClNwjyOrf7V3qMyzW6GK6P5mzNBlPbOGZFY GKbeWM07/TUAufpWc78RET9w/x+fFBLsz3iupDrN7KVDHOI7sYyUBpQx2s1y+Wm0Q+OS 7QRkyXFTi1xArkirl4yiUt5M4k1Sjb/wdFxhQtBrahIW7PF0YD2otbiUSsLhH3Wc08tr zxwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:reply-to :from:date:message-id:subject:to:cc; bh=YzZ+gcY4tc/Mcg4oDnxEr1RZRYt8nHqsxu6pFXmKpdQ=; b=Zm2ZynQXiDZtIQYb+72UkHnyOexiNCFW5IHhqxevzEvBpVN/qIyBHwO2Rz09TPyTAj nXjH9FCTf/b6LPe0rUFEHAXtMC41B4jJp8spmZTw8PVbwwZvlzOtxnl0p5KZSZg5EOW1 Rzqp4jcgorKC/m6IEhkSsEeXo6ojscrW7RlD44VUtrj7FmQVR2QWaZYduwH51697NFYe tNzKIAZjO1IONYdbg+hy2fbkepjXJwUXLRzX4ndA8UQZazKt+6bZWhMy2gEKWMEKVXnu i935Ff1YAJFl7Er7+2i9I8cYN44swiOK0X0wDZviTi5/DKgMLJZ3VoWfDTjFlnFoYW8L UidA== X-Gm-Message-State: AElRT7EyWDN5zFqDvlHzSzr2HZpnRCxzs1z+sT18Bj/2T0vXq6cR86vl SPFu2/zkEQUz0bQVZLaQ6c3wNFxXUtHfDN4eYfI= X-Google-Smtp-Source: AIpwx4/prFLT5RwXe8sc150paMFYWYOjdBwkzJ5LSoCRP8ST7HIlE3RY5BloPRAdPBESUoAEGcmJ1U5yrlBICYgBHgg= X-Received: by 2002:a19:1d12:: with SMTP id d18-v6mr5304367lfd.128.1522333034721; Thu, 29 Mar 2018 07:17:14 -0700 (PDT) MIME-Version: 1.0 References: <201803290451.w2T4p8NK035072@repo.freebsd.org> <201803291320.w2TDKej2063088@pdx.rh.CN85.dnsmgr.net> In-Reply-To: <201803291320.w2TDKej2063088@pdx.rh.CN85.dnsmgr.net> Reply-To: araujo@freebsd.org From: Marcelo Araujo Date: Thu, 29 Mar 2018 14:17:03 +0000 Message-ID: Subject: Re: svn commit: r331728 - in stable/11/etc: . rc.d To: "Rodney W. Grimes" Cc: Marcelo Araujo , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.25 X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Mar 2018 14:17:17 -0000 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 > > 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 >