From 58f179e6c87dc1ce4a95a0b002739214f1d7f57b Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Tue, 24 Apr 2007 23:15:27 +0000
Subject: [PATCH] Fixes for log levels

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6111 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-perl/Shorewall/Rules.pm | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/Shorewall-perl/Shorewall/Rules.pm b/Shorewall-perl/Shorewall/Rules.pm
index 850648a5d..ef97aa7a0 100644
--- a/Shorewall-perl/Shorewall/Rules.pm
+++ b/Shorewall-perl/Shorewall/Rules.pm
@@ -178,7 +178,7 @@ sub setup_ecn()
 sub add_rule_pair( $$$$ ) {
     my ($chainref , $predicate , $target , $level ) = @_;
 
-    log_rule $level, $chainref, $target,  , $predicate,  if $level;
+    log_rule $level, $chainref, $target,  , $predicate,  if defined $level && $level ne '';
     add_rule $chainref , "${predicate}-j $target";
 }
 
@@ -248,7 +248,8 @@ sub setup_syn_flood_chains() {
 	    $burst = $burst ? "--limit-burst $burst " : '';
 	    my $synchainref = new_chain 'filter' , syn_chain $chainref->{name};
 	    add_rule $synchainref , "-m limit --limit $limit ${burst}-j RETURN";
-	    log_rule_limit $level , $synchainref , $chainref->{name} , 'DROP', '-m limit --limit 5/min --limit-burst 5' , '' , 'add' , '' if $level;
+	    log_rule_limit $level , $synchainref , $chainref->{name} , 'DROP', '-m limit --limit 5/min --limit-burst 5' , '' , 'add' , ''
+		if defined $level && $level ne '';
 	    add_rule $synchainref, '-j DROP';
 	}
     }
@@ -264,7 +265,7 @@ sub setup_blacklist() {
     if ( @$hosts ) {
 	$chainref = new_standard_chain 'blacklst';
 
-	if ( $level ) {
+	if ( defined $level && $level ne '' ) {
 	    my $logchainref = new_standard_chain 'blacklog';
 
 	    log_rule_limit( $level , $logchainref , 'blacklst' , $disposition , "$globals{LOGLIMIT}" , '', 'add',	'' );
@@ -555,7 +556,7 @@ sub add_common_rules() {
 
 	$chainref = new_standard_chain 'tcpflags';
 
-	if ( $config{TCP_FLAGS_LOG_LEVEL} ) {
+	if ( $config{TCP_FLAGS_LOG_LEVEL} ne ''  ) {
 	    my $logflagsref = new_standard_chain 'logflags';
 
 	    my $savelogparms = $globals{LOGPARMS};
@@ -711,11 +712,13 @@ sub setup_mac_lists( $ ) {
 		if ( $addresses ) {
 		    for my $address ( split ',', $addresses ) {
 			my $source = match_source_net $address;
-			log_rule_limit $level, $chainref , mac_chain( $interface) , $disposition, '', '', 'add' , "${mac}${source}" if $level;
+			log_rule_limit $level, $chainref , mac_chain( $interface) , $disposition, '', '', 'add' , "${mac}${source}" 
+			    if defined $level && $level ne '';
 			add_rule $chainref , "${mac}${source}-j $targetref->{target}";
 		    }
 		} else {
-		    log_rule_limit $level, $chainref , mac_chain( $interface) , $disposition, '', '', 'add' , $mac if $level;
+		    log_rule_limit $level, $chainref , mac_chain( $interface) , $disposition, '', '', 'add' , $mac
+			if defined $level && $level ne '';
 		    add_rule $chainref , "$mac-j $targetref->{target}";
 		}
 
@@ -1168,7 +1171,7 @@ sub process_rule ( $$$$$$$$$ ) {
 				if ( ( ( my $policy ) = $policychainref->{policy} ) ne 'NONE' ) {
 				    if ( $optimize > 0 ) {
 					my $loglevel = $policychainref->{loglevel};
-					if ( $loglevel ) {
+					if ( $loglevel ne '' ) {
 					    next if $target eq "${policy}:$loglevel}";
 					} else {
 					    next if $action eq $policy;
@@ -1188,7 +1191,7 @@ sub process_rule ( $$$$$$$$$ ) {
 			if ( ( ( my $policy ) = $policychainref->{policy} ) ne 'NONE' ) {
 			    if ( $optimize > 0 ) {
 				my $loglevel = $policychainref->{loglevel};
-				if ( $loglevel ) {
+				if ( $loglevel ne '') {
 				    next if $target eq "${policy}:$loglevel}";
 				} else {
 				    next if $action eq $policy;
@@ -1209,7 +1212,7 @@ sub process_rule ( $$$$$$$$$ ) {
 		if ( ( ( my $policy ) = $policychainref->{policy} ) ne 'NONE' ) {
 		    if ( $optimize > 0 ) {
 			my $loglevel = $policychainref->{loglevel};
-			if ( $loglevel ) {
+			if ( $loglevel ne '' ) {
 			    next if $target eq "${policy}:$loglevel}";
 			} else {
 			    next if $action eq $policy;