From 4bf78248494603f8cd868b67cc31c0b142086a72 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Tue, 3 May 2005 22:45:04 +0000
Subject: [PATCH] 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
---
 Shorewall2/firewall | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Shorewall2/firewall b/Shorewall2/firewall
index 770501125..bca09fab4 100755
--- a/Shorewall2/firewall
+++ b/Shorewall2/firewall
@@ -2409,7 +2409,7 @@ process_tc_rule()
 	    
 	    case "$user" in
 		*+*)
-		    r="$r --cmd-owner ${user#*/}"
+		    r="$r --cmd-owner ${user#*+}"
 		    user=${user%+*}
 		    ;;
 	    esac
@@ -2756,7 +2756,7 @@ process_accounting_rule() {
 		    if [ -n "${user#*+}" ]; then
 			rule="$rule ! --cmd-owner ${user#*+} "
 		    fi
-		    user1=${user%/+}
+		    user1=${user%+*}
 		    ;;		
 		*+*)
 		    if [ -n "${user#*+}" ]; then
@@ -4365,7 +4365,7 @@ process_rule() # $1 = target
 		    userspec=${userspec%+*}
 		fi
 		;;		
-	    */*)
+	    *+*)
 		if [ "$userspec" != "+" ]; then
 		    userandgroup="$userandgroup --cmd-owner ${userspec#*+}"
 		    userspec=${userspec%+*}