Simplify a couple of tests

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7708 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-11-21 00:07:47 +00:00
parent 5cf732edc2
commit 616f3e0016

View File

@ -434,7 +434,7 @@ sub process_action1 ( $$ ) {
my $targettype = $targets{$target}; my $targettype = $targets{$target};
if ( defined $targettype ) { if ( defined $targettype ) {
return if ( $targettype == STANDARD ) || ( $targettype == MACRO ) || ( $targettype & ( LOGRULE | NFQ | CHAIN ) ); return if ( $targettype == STANDARD ) || ( $targettype & ( MACRO | LOGRULE | NFQ | CHAIN ) );
fatal_error "Invalid TARGET ($target)" if $targettype & STANDARD; fatal_error "Invalid TARGET ($target)" if $targettype & STANDARD;
@ -665,7 +665,7 @@ sub process_action3( $$$$$ ) {
if ( $action2type & ACTION ) { if ( $action2type & ACTION ) {
$target2 = (find_logactionchain ( $target = $target2 ))->{name}; $target2 = (find_logactionchain ( $target = $target2 ))->{name};
} else { } else {
fatal_error "Internal Error" unless $action2type == MACRO || $action2type & ( LOGRULE | NFQ | CHAIN ); fatal_error "Internal Error" unless $action2type & ( MACRO | LOGRULE | NFQ | CHAIN );
} }
} }