Date: Tue, 13 Oct 2015 18:47:05 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r289250 - stable/9/etc/rc.d Message-ID: <201510131847.t9DIl5aI025479@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Tue Oct 13 18:47:05 2015 New Revision: 289250 URL: https://svnweb.freebsd.org/changeset/base/289250 Log: MFC r288390: When stopping ugidfw, it is not enough to just try unloading the module. If the module is built-in to the kernel then the kldunload will fail. Rather than do this just check if there are rules and then remove them all. Relnotes: yes Modified: stable/9/etc/rc.d/ugidfw Directory Properties: stable/9/etc/ (props changed) stable/9/etc/rc.d/ (props changed) Modified: stable/9/etc/rc.d/ugidfw ============================================================================== --- stable/9/etc/rc.d/ugidfw Tue Oct 13 18:46:11 2015 (r289249) +++ stable/9/etc/rc.d/ugidfw Tue Oct 13 18:47:05 2015 (r289250) @@ -3,6 +3,7 @@ # $FreeBSD$ # PROVIDE: ugidfw +# REQUIRE: FILESYSTEMS # BEFORE: LOGIN # KEYWORD: nojail shutdown @@ -33,9 +34,17 @@ ugidfw_start() ugidfw_stop() { + local rulecount + # Disable the policy # - kldunload mac_bsdextended + # Check for the existence of rules and flush them if needed. + rulecount=$(sysctl -in security.mac.bsdextended.rule_count) + if [ ${rulecount:-0} -gt 0 ]; then + ugidfw list | sed -n '2,$p' | cut -d ' ' -f 1 | sort -r -n | + xargs -n 1 ugidfw remove + echo "MAC bsdextended rules flushed." + fi } load_rc_config $name
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510131847.t9DIl5aI025479>