Fix a couple of bugs in cmd-owner

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@2082 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2005-05-03 22:45:04 +00:00
parent 2a49610b49
commit 4bf7824849

View File

@ -2409,7 +2409,7 @@ process_tc_rule()
case "$user" in case "$user" in
*+*) *+*)
r="$r --cmd-owner ${user#*/}" r="$r --cmd-owner ${user#*+}"
user=${user%+*} user=${user%+*}
;; ;;
esac esac
@ -2756,7 +2756,7 @@ process_accounting_rule() {
if [ -n "${user#*+}" ]; then if [ -n "${user#*+}" ]; then
rule="$rule ! --cmd-owner ${user#*+} " rule="$rule ! --cmd-owner ${user#*+} "
fi fi
user1=${user%/+} user1=${user%+*}
;; ;;
*+*) *+*)
if [ -n "${user#*+}" ]; then if [ -n "${user#*+}" ]; then
@ -4365,7 +4365,7 @@ process_rule() # $1 = target
userspec=${userspec%+*} userspec=${userspec%+*}
fi fi
;; ;;
*/*) *+*)
if [ "$userspec" != "+" ]; then if [ "$userspec" != "+" ]; then
userandgroup="$userandgroup --cmd-owner ${userspec#*+}" userandgroup="$userandgroup --cmd-owner ${userspec#*+}"
userspec=${userspec%+*} userspec=${userspec%+*}