Fix some rule problems

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6154 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-04-30 15:07:51 +00:00
parent 16c2fffc36
commit c1d6faf509
2 changed files with 5 additions and 2 deletions

View File

@ -197,6 +197,7 @@ use constant { STANDARD => 1, #defined by Netfilter
# #
our %targets = ('ACCEPT' => STANDARD, our %targets = ('ACCEPT' => STANDARD,
'ACCEPT+' => STANDARD + NONAT, 'ACCEPT+' => STANDARD + NONAT,
'ACCEPT-' => STANDARD
'ACCEPT!' => STANDARD, 'ACCEPT!' => STANDARD,
'NONAT' => STANDARD + NONAT + NATONLY, 'NONAT' => STANDARD + NONAT + NATONLY,
'DROP' => STANDARD, 'DROP' => STANDARD,
@ -209,7 +210,9 @@ our %targets = ('ACCEPT' => STANDARD,
'REDIRECT-' => NATRULE + REDIRECT + NATONLY, 'REDIRECT-' => NATRULE + REDIRECT + NATONLY,
'LOG' => STANDARD + LOGRULE, 'LOG' => STANDARD + LOGRULE,
'CONTINUE' => STANDARD, 'CONTINUE' => STANDARD,
'CONTINUE!' => STANDARD,
'QUEUE' => STANDARD, 'QUEUE' => STANDARD,
'QUEUE!' => STANDARD,
'SAME' => NATRULE, 'SAME' => NATRULE,
'SAME-' => NATRULE + NATONLY, 'SAME-' => NATRULE + NATONLY,
'dropBcast' => BUILTIN + ACTION, 'dropBcast' => BUILTIN + ACTION,

View File

@ -2448,7 +2448,7 @@ process_macro() # $1 = target
esac esac
case ${mtarget%%:*} in case ${mtarget%%:*} in
ACCEPT|ACCEPT!|ACCEPT+|NONAT|DROP|DROP!|REJECT|REJECT!|DNAT|DNAT-|REDIRECT|REDIRECT-|LOG|CONTINUE|QUEUE|SAME|SAME-) ACCEPT|ACCEPT!|ACCEPT+|NONAT|DROP|DROP!|REJECT|REJECT!|DNAT|DNAT-|REDIRECT|REDIRECT-|LOG|CONTINUE|CONTINUE!|QUEUE|SAME|SAME-)
;; ;;
*) *)
if list_search ${mtarget%%:*} $ACTIONS; then if list_search ${mtarget%%:*} $ACTIONS; then
@ -2629,7 +2629,7 @@ process_rules()
ACCEPT|ACCEPT+|NONAT|DROP|REJECT|DNAT|DNAT-|REDIRECT|REDIRECT-|LOG|CONTINUE|QUEUE|SAME|SAME-) ACCEPT|ACCEPT+|NONAT|DROP|REJECT|DNAT|DNAT-|REDIRECT|REDIRECT-|LOG|CONTINUE|QUEUE|SAME|SAME-)
do_it No do_it No
;; ;;
ACCEPT!|DROP!REJECT!|QUEUE!|CONTINUE!) ACCEPT!|DROP!|REJECT!|QUEUE!|CONTINUE!)
optimize=0 optimize=0
do_it No do_it No
;; ;;