extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-27 10:03:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bring forward action processing fix

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4873 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-11-14 18:19:16 +00:00
parent 5dee3233d1
commit 09d44df548
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Shorewall/compiler
View File

@ -1198,6 +1198,16 @@ createlogactionchain() # $1 = Action Name, $2 = Log Level [: Log Tag ]
createactionchain() # $1 = Action, including log level and tag if any
{
create_simple_chain()
{
CHAIN=$1
LEVEL=
TAG=
createchain $CHAIN no
process_action_file $CHAIN
}
case $1 in
*::*)
fatal_error "Invalid ACTION $1"
@ -1208,15 +1218,15 @@ createactionchain() # $1 = Action, including log level and tag if any
;;
*:*)
set -- $(split $1)
createlogactionchain $1 $2
if [ "x$2" = xnone ]; then
create_simple_chain $1
else
createlogactionchain $1 $2
fi
;;
*)
CHAIN=$1
LEVEL=
TAG=
createchain $CHAIN no
process_action_file $CHAIN
create_simple_chain $1
;;
esac
}
@ -1229,13 +1239,21 @@ find_logactionchain() # $1 = Action, including log level and tag if any
{
local fullaction=$1 action=${1%%:*} level= chains=
find_simpleaction() {
havechain $action || fatal_error "Fatal error in find_logactionchain"
echo $action
}
case $fullaction in
*:*)
level=${fullaction#*:}
if [ "x$level" = xnone ]; then
find_simpleaction
return
fi
;;
*)
havechain $action || fatal_error "Fatal error in find_logactionchain"
echo $action
find_simpleaction
return
;;
esac