From b734d3af3175135e39ddb0e096dd43a53f01e10b Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Fri, 10 Apr 2009 20:36:09 +0000
Subject: [PATCH] Fix subtle bug introduced in last commit

Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9842 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/Perl/Shorewall/Chains.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Shorewall/Perl/Shorewall/Chains.pm b/Shorewall/Perl/Shorewall/Chains.pm
index 2ff1a0011..3628ed03b 100644
--- a/Shorewall/Perl/Shorewall/Chains.pm
+++ b/Shorewall/Perl/Shorewall/Chains.pm
@@ -2697,7 +2697,7 @@ sub expand_rule( $$$$$$$$$$ )
 
 		    $source_match  = match_source_net( $inet, $restriction ) unless $capabilities{KLUDGEFREE};
 		    my $dest_match = match_dest_net( $dnet );
-		    my $rule = join( '', $rule, $source_match, $dest_match, $onet );
+		    my $predicates = join( '', $rule, $source_match, $dest_match, $onet );
 		    
 		    if ( $loglevel ne '' ) {
 			if ( $disposition ne 'LOG' ) {
@@ -2708,9 +2708,9 @@ sub expand_rule( $$$$$$$$$$ )
 			    #
 			    # Jump to the log chain if all of the rule's conditions are met
 			    #
-			    add_jump( $chainref, $logchainref, $builtin_target{$disposition},  $rule, 1 );
+			    add_jump( $chainref, $logchainref, $builtin_target{$disposition},  $predicates, 1 );
 
-			    $rule = '';
+			    $predicates = '';
 
 			    log_rule_limit( 
 					   $loglevel ,
@@ -2730,13 +2730,13 @@ sub expand_rule( $$$$$$$$$$ )
 					   '' ,
 					   $logtag ,
 					   'add' ,
-					   $rule
+					   $predicates
 					  );
 			}
 		    }
 
 		    unless ( $disposition eq 'LOG' ) {
-			add_rule( $chainref, $rule . $target , 1 );
+			add_rule( $chainref, $predicates . $target , 1 );
 		    }
 		}
 	    }