From bfd63dcace8a050189e59fb2465282f975bcd4ae Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Fri, 22 Jul 2011 07:53:30 -0700
Subject: [PATCH] Revert LOGLIMIT conversion change

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/Perl/Shorewall/Config.pm | 39 +++++++++++++-----------------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm
index 74b0ff78f..701e5c933 100644
--- a/Shorewall/Perl/Shorewall/Config.pm
+++ b/Shorewall/Perl/Shorewall/Config.pm
@@ -3406,12 +3406,12 @@ sub get_configuration( $$$ ) {
     $globals{STATEMATCH} = '-m conntrack --ctstate' if have_capability 'CONNTRACK_MATCH';
 
     if ( my $rate = $config{LOGLIMIT} ) {
-	my ( $option, $limit );
+	my $limit;
 
 	if ( $rate =~ /^[sd]:/ ) {
 	    require_capability 'HASHLIMIT_MATCH', 'Per-ip log rate limiting' , 's';
 
-	    $option = 'hashlimit';
+	    $limit = "-m hashlimit ";
 
 	    my $match = have_capability( 'OLD_HL_MATCH' ) ? 'hashlimit' : 'hashlimit-upto';
 	    my $units;
@@ -3420,11 +3420,11 @@ sub get_configuration( $$$ ) {
 		fatal_error "Invalid rate ($1)" unless $2;
 		fatal_error "Invalid burst value ($5)" unless $5;
 
-		$limit = "--$match $1 --hashlimit-burst $5 --hashlimit-name lograte --hashlimit-mode ";
+		$limit .= "--$match $1 --hashlimit-burst $5 --hashlimit-name lograte --hashlimit-mode ";
 		$units = $4;
 	    } elsif ( $rate =~ /^[sd]:((\d+)(\/(sec|min|hour|day))?)$/ ) {
 		fatal_error "Invalid rate ($1)" unless $2;
-		$limit = "--$match $1 --hashlimit-name lograte --hashlimit-mode ";
+		$limit .= "--$match $1 --hashlimit-name lograte --hashlimit-mode ";
 		$units = $4;
 	    } else {
 		fatal_error "Invalid rate ($rate)";
@@ -3442,22 +3442,18 @@ sub get_configuration( $$$ ) {
 
 		$limit .= "--hashlimit-htable-expire $expire ";
 	    }
+	} elsif ( $rate =~ /^((\d+)(\/(sec|min|hour|day))):(\d+)$/ ) {
+	    fatal_error "Invalid rate ($1)" unless $2;
+	    fatal_error "Invalid burst value ($5)" unless $5;
+	    $limit = "-m limit --limit $1 --limit-burst $5 ";
+	} elsif ( $rate =~ /^(\d+)(\/(sec|min|hour|day))?$/ )  {
+	    fatal_error "Invalid rate (${1}${2})" unless $1;
+	    $limit = "-m limit --limit $rate ";
 	} else {
-	    $option = 'limit';
-
-	    if ( $rate =~ /^((\d+)(\/(sec|min|hour|day))):(\d+)$/ ) {
-		fatal_error "Invalid rate ($1)" unless $2;
-		fatal_error "Invalid burst value ($5)" unless $5;
-		$limit = "--limit $1 --limit-burst $5";
-	    } elsif ( $rate =~ /^(\d+)(\/(sec|min|hour|day))?$/ )  {
-		fatal_error "Invalid rate (${1}${2})" unless $1;
-		$limit = "--limit $rate";
-	    } else {
-		fatal_error "Invalid rate ($rate)";
-	    }
+	    fatal_error "Invalid rate ($rate)";
 	}
 
-	$globals{LOGLIMIT} = [ $option => $limit ];
+	$globals{LOGLIMIT} = $limit;
 
 	warning_message "LOGRATE Ignored when LOGLIMIT is specified"  if $config{LOGRATE};
 	warning_message "LOGBURST Ignored when LOGLIMIT is specified" if $config{LOGBURST};
@@ -3471,12 +3467,11 @@ sub get_configuration( $$$ ) {
 	    fatal_error"Invalid LOGBURST ($config{LOGBURST})" unless $config{LOGBURST} =~ /^\d+$/;
 	}
 
-	my $limit = "--limit $config{LOGRATE} "        if supplied $config{LOGRATE};
-	$limit   .= "--limit-burst $config{LOGBURST} " if supplied $config{LOGBURST};
-	
-	$globals{LOGLIMIT} = [ limit => $limit ];
+	$globals{LOGLIMIT}  = '-m limit ';
+	$globals{LOGLIMIT} .= "--limit $config{LOGRATE} "        if supplied $config{LOGRATE};
+	$globals{LOGLIMIT} .= "--limit-burst $config{LOGBURST} " if supplied $config{LOGBURST};
     } else {
-	$globals{LOGLIMIT} = [];
+	$globals{LOGLIMIT} = '';
     }
 
     check_trivalue ( 'IP_FORWARDING', 'on' );