From 616f3e00166d28e8c793739457a8bfbe61cab901 Mon Sep 17 00:00:00 2001 From: teastep Date: Wed, 21 Nov 2007 00:07:47 +0000 Subject: [PATCH] Simplify a couple of tests git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7708 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall-perl/Shorewall/Actions.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Shorewall-perl/Shorewall/Actions.pm b/Shorewall-perl/Shorewall/Actions.pm index f376aa948..f17063bdb 100644 --- a/Shorewall-perl/Shorewall/Actions.pm +++ b/Shorewall-perl/Shorewall/Actions.pm @@ -434,7 +434,7 @@ sub process_action1 ( $$ ) { my $targettype = $targets{$target}; 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; @@ -665,7 +665,7 @@ sub process_action3( $$$$$ ) { if ( $action2type & ACTION ) { $target2 = (find_logactionchain ( $target = $target2 ))->{name}; } else { - fatal_error "Internal Error" unless $action2type == MACRO || $action2type & ( LOGRULE | NFQ | CHAIN ); + fatal_error "Internal Error" unless $action2type & ( MACRO | LOGRULE | NFQ | CHAIN ); } }