From 2b2200145f2723054fee4036f3247497c6934e0d Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Fri, 22 Jul 2011 06:36:59 -0700
Subject: [PATCH] Clean up push_irule() after branching 4.4.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/Perl/Shorewall/Chains.pm | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/Shorewall/Perl/Shorewall/Chains.pm b/Shorewall/Perl/Shorewall/Chains.pm
index 747c25d2f..6813bf7d0 100644
--- 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;