Allow the log tag to act as a generalized parameter to an action extension script -- take 3

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@2587 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2005-08-29 21:58:24 +00:00
parent 5d8fee4263
commit 934a6e852f

View File

@ -4211,6 +4211,9 @@ createlogactionchain() # $1 = Action Name, $2 = Log Level [: Log Tag ]
createactionchain() # $1 = Action, including log level and tag if any createactionchain() # $1 = Action, including log level and tag if any
{ {
case $1 in case $1 in
*::*)
fatal_error "Invalid ACTION $1"
;;
*:*:*) *:*:*)
set -- $(split $1) set -- $(split $1)
createlogactionchain $1 $2:$3 createlogactionchain $1 $2:$3
@ -4276,9 +4279,6 @@ merge_levels() # $1=level at which superior action is called, $2=level at which
set -- $(split $1) set -- $(split $1)
case $superior in case $superior in
*::*)
fatal_error "Invalid ACTION $superior"
;;
*:*:*) *:*:*)
case $2 in case $2 in
'none!') 'none!')