mirror of
https://gitlab.com/shorewall/code.git
synced 2024-11-15 04:04:10 +01:00
Try to handle 'action:' correctly
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6226 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
dbbfa59780
commit
416f863ea3
@ -1238,6 +1238,9 @@ createactionchain() # $1 = Action, including log level and tag if any
|
|||||||
set -- $(split $1)
|
set -- $(split $1)
|
||||||
createlogactionchain $1 $2:$3
|
createlogactionchain $1 $2:$3
|
||||||
;;
|
;;
|
||||||
|
*:)
|
||||||
|
create_simple_chain ${1%:*}
|
||||||
|
;;
|
||||||
*:*)
|
*:*)
|
||||||
set -- $(split $1)
|
set -- $(split $1)
|
||||||
|
|
||||||
@ -1267,6 +1270,10 @@ find_logactionchain() # $1 = Action, including log level and tag if any
|
|||||||
}
|
}
|
||||||
|
|
||||||
case $fullaction in
|
case $fullaction in
|
||||||
|
*:)
|
||||||
|
find_simpleaction
|
||||||
|
return
|
||||||
|
;;
|
||||||
*:*)
|
*:*)
|
||||||
level=${fullaction#*:}
|
level=${fullaction#*:}
|
||||||
if [ "x$level" = xnone ]; then
|
if [ "x$level" = xnone ]; then
|
||||||
@ -2129,6 +2136,9 @@ process_rule() # $1 = target
|
|||||||
loglevel=
|
loglevel=
|
||||||
[ $target = LOG ] && return
|
[ $target = LOG ] && return
|
||||||
;;
|
;;
|
||||||
|
*)
|
||||||
|
[ -n "$loglevel" ] || target=${target%:*}
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
loglevel=${loglevel%\!}
|
loglevel=${loglevel%\!}
|
||||||
|
Loading…
Reference in New Issue
Block a user