From 8862edf857848d940a6188dd2073e2d0fe4b4eb4 Mon Sep 17 00:00:00 2001 From: Maxim Konovalov Date: Sun, 2 Oct 2005 07:03:00 +0000 Subject: [PATCH] o Remove unfinished code and make it possible to override bsdextended_script from rc.conf(5): Not objected by: trhodes --- etc/rc.d/ugidfw | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/etc/rc.d/ugidfw b/etc/rc.d/ugidfw index 1d5f885f52b2..6b47a8176a4f 100644 --- a/etc/rc.d/ugidfw +++ b/etc/rc.d/ugidfw @@ -19,7 +19,6 @@ ugidfw_load() { if [ -r "${bsdextended_script}" ]; then . "${bsdextended_script}" - echo -n " ${_bsdextended_profile}" fi } @@ -39,20 +38,12 @@ ugidfw_precmd() ugidfw_start() { - # check for existing profiles and set the default policy script - # if none was specified - [ -z "${bsdextended_profiles}" ] && { - bsdextended_profiles=default - [ -z "${bsdextended_script}" ] && bsdextended_script=/etc/rc.bsdextended - bsdextended_default_script=/etc/rc.bsdextended - } + [ -z "${bsdextended_script}" ] && bsdextended_script=/etc/rc.bsdextended - echo -n "Loading MAC bsdextended rules:" - for _bsdextended_profile in ${bsdextended_profiles}; do - eval bsdextended_script=\"\$bsdextended_${_bsdextended_profile}_script\" - ugidfw_load - done - echo '.' + if [ -r "${bsdextended_script}" ]; then + ugidfw_load + echo "MAC bsdextended rules loaded." + fi } ugidfw_stop()