diff options
author | maxim <maxim@FreeBSD.org> | 2005-10-02 07:03:00 +0000 |
---|---|---|
committer | maxim <maxim@FreeBSD.org> | 2005-10-02 07:03:00 +0000 |
commit | 1becc1ee390faaa609b04a998f1538c4f6723d02 (patch) | |
tree | ac183e37b8ed7caa5c5f9f1fe01a1d9029e1de76 | |
parent | 21345d1652e54640c8a244f7f75717f7078e5a01 (diff) | |
download | FreeBSD-src-1becc1ee390faaa609b04a998f1538c4f6723d02.zip FreeBSD-src-1becc1ee390faaa609b04a998f1538c4f6723d02.tar.gz |
o Remove unfinished code and make it possible to override
bsdextended_script from rc.conf(5):
Not objected by: trhodes
-rw-r--r-- | etc/rc.d/ugidfw | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/etc/rc.d/ugidfw b/etc/rc.d/ugidfw index 1d5f885..6b47a81 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() |