Clean up push_irule() after branching 4.4.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
2011-07-22 06:36:59 -07:00
1 changed files with 2 additions and 8 deletions
--- a/Shorewall/Perl/Shorewall/Chains.pm
+++ b/Shorewall/Perl/Shorewall/Chains.pm
@@ -1069,17 +1069,11 @@ sub push_irule( $$$;@ ) {

    $chainref->{referenced} = 1;

-    if ( $ruleref->{simple} = ! @matches ) {
-	push @{$chainref->{rules}}, $ruleref;
-
-    } else {
-	#
-	# In the future, we can expand port lists here
-	#
+    unless ( $ruleref->{simple} = ! @matches ) {
 	$chainref->{dont_optimize} = 1 if push_matches( $ruleref, @matches );
-	push @{$chainref->{rules}}, $ruleref;
    }

+    push @{$chainref->{rules}}, $ruleref;

    trace( $chainref, 'A', @{$chainref->{rules}}, format_rule( $chainref, $ruleref ) ) if $debug;