From 73b9198d6d7ffb334eef4db575e09d84abddc24c Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Mon, 13 Jun 2011 06:39:38 -0700
Subject: [PATCH] Quell compiler warnings from Perl 5.14.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/Perl/Shorewall/Chains.pm   | 20 ++++++++++----------
 Shorewall/Perl/Shorewall/Compiler.pm |  4 ++--
 Shorewall/Perl/Shorewall/Config.pm   |  4 ++--
 Shorewall/Perl/Shorewall/Misc.pm     |  2 +-
 Shorewall/Perl/Shorewall/Rules.pm    |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Shorewall/Perl/Shorewall/Chains.pm b/Shorewall/Perl/Shorewall/Chains.pm
index e1893b98f..32433a32d 100644
--- a/Shorewall/Perl/Shorewall/Chains.pm
+++ b/Shorewall/Perl/Shorewall/Chains.pm
@@ -1596,24 +1596,24 @@ sub initialize_chain_table($) {
 		    'DEL'             => STANDARD + SET,
 		   );
 
-	for my $chain qw(OUTPUT PREROUTING) {
+	for my $chain ( qw(OUTPUT PREROUTING) ) {
 	    new_builtin_chain 'raw', $chain, 'ACCEPT';
 	}
 
-	for my $chain qw(INPUT OUTPUT FORWARD) {
+	for my $chain ( qw(INPUT OUTPUT FORWARD) ) {
 	    new_builtin_chain 'filter', $chain, 'DROP';
 	}
 
-	for my $chain qw(PREROUTING POSTROUTING OUTPUT) {
+	for my $chain ( qw(PREROUTING POSTROUTING OUTPUT) ) {
 	    new_builtin_chain 'nat', $chain, 'ACCEPT';
 	}
 
-	for my $chain qw(PREROUTING INPUT OUTPUT ) {
+	for my $chain ( qw(PREROUTING INPUT OUTPUT ) ) {
 	    new_builtin_chain 'mangle', $chain, 'ACCEPT';
 	}
 
 	if ( have_capability( 'MANGLE_FORWARD' ) ) {
-	    for my $chain qw( FORWARD POSTROUTING ) {
+	    for my $chain ( qw( FORWARD POSTROUTING ) ) {
 		new_builtin_chain 'mangle', $chain, 'ACCEPT';
 	    }
 	}
@@ -1639,19 +1639,19 @@ sub initialize_chain_table($) {
 		    'DEL'             => STANDARD + SET,
 		   );
 
-	for my $chain qw(OUTPUT PREROUTING) {
+	for my $chain ( qw(OUTPUT PREROUTING) ) {
 	    new_builtin_chain 'raw', $chain, 'ACCEPT';
 	}
 
-	for my $chain qw(INPUT OUTPUT FORWARD) {
+	for my $chain ( qw(INPUT OUTPUT FORWARD) ) {
 	    new_builtin_chain 'filter', $chain, 'DROP';
 	}
 
-	for my $chain qw(PREROUTING POSTROUTING OUTPUT) {
+	for my $chain ( qw(PREROUTING POSTROUTING OUTPUT) ) {
 	    new_builtin_chain 'nat', $chain, 'ACCEPT';
 	}
 
-	for my $chain qw(PREROUTING INPUT OUTPUT FORWARD POSTROUTING ) {
+	for my $chain ( qw(PREROUTING INPUT OUTPUT FORWARD POSTROUTING ) ) {
 	    new_builtin_chain 'mangle', $chain, 'ACCEPT';
 	}
     }
@@ -4834,7 +4834,7 @@ sub create_chainlist_reload($) {
 
 	enter_cat_mode;
 
-	for $table qw(raw nat mangle filter) {
+	for $table ( qw(raw nat mangle filter) ) {
 	    my $tableref=$chains{$table};
 
 	    next unless $tableref;
diff --git a/Shorewall/Perl/Shorewall/Compiler.pm b/Shorewall/Perl/Shorewall/Compiler.pm
index a1ccc818f..499870a76 100644
--- a/Shorewall/Perl/Shorewall/Compiler.pm
+++ b/Shorewall/Perl/Shorewall/Compiler.pm
@@ -108,7 +108,7 @@ sub generate_script_1( $ ) {
 ################################################################################
 EOF
 
-    for my $exit qw/init start tcclear started stop stopped clear refresh refreshed restored/ {
+    for my $exit ( qw/init start tcclear started stop stopped clear refresh refreshed restored/ ) {
 	emit "\nrun_${exit}_exit() {";
 	push_indent;
 	append_file $exit or emit 'true';
@@ -116,7 +116,7 @@ EOF
 	emit '}';
     }
 
-    for my $exit qw/isusable findgw/ {
+    for my $exit ( qw/isusable findgw/ ) {
 	emit "\nrun_${exit}_exit() {";
 	push_indent;
 	append_file($exit, 1) or emit 'true';
diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm
index b3df85502..3b68ff606 100644
--- a/Shorewall/Perl/Shorewall/Config.pm
+++ b/Shorewall/Perl/Shorewall/Config.pm
@@ -3474,7 +3474,7 @@ sub get_configuration( $ ) {
     fatal_error 'IPSECFILE=ipsec is not supported by Shorewall ' . $globals{VERSION} if $config{IPSECFILE} eq 'ipsec';
     fatal_error "Invalid IPSECFILE value ($config{IPSECFILE}"                    unless $config{IPSECFILE} eq 'zones';
 
-    for my $default qw/DROP_DEFAULT REJECT_DEFAULT QUEUE_DEFAULT NFQUEUE_DEFAULT ACCEPT_DEFAULT/ {
+    for my $default ( qw/DROP_DEFAULT REJECT_DEFAULT QUEUE_DEFAULT NFQUEUE_DEFAULT ACCEPT_DEFAULT/ ) {
 	$config{$default} = 'none' if "\L$config{$default}" eq 'none';
     }
 
@@ -3679,7 +3679,7 @@ sub generate_aux_config() {
 
     emit "#\n# Shorewall auxiliary configuration file created by Shorewall version $globals{VERSION} - $date\n#";
 
-    for my $option qw(VERBOSITY LOGFILE LOGFORMAT IPTABLES IP6TABLES IP TC IPSET PATH SHOREWALL_SHELL SUBSYSLOCK LOCKFILE RESTOREFILE) {
+    for my $option ( qw(VERBOSITY LOGFILE LOGFORMAT IPTABLES IP6TABLES IP TC IPSET PATH SHOREWALL_SHELL SUBSYSLOCK LOCKFILE RESTOREFILE) ) {
 	conditionally_add_option $option;
     }
 
diff --git a/Shorewall/Perl/Shorewall/Misc.pm b/Shorewall/Perl/Shorewall/Misc.pm
index 2f1fe3620..ff1de96e0 100644
--- a/Shorewall/Perl/Shorewall/Misc.pm
+++ b/Shorewall/Perl/Shorewall/Misc.pm
@@ -1826,7 +1826,7 @@ sub generate_matrix() {
     }
 
     if ( $config{LOGALLNEW} ) {
-	for my $table qw/mangle nat filter/ {
+	for my $table ( qw/mangle nat filter/ ) {
 	    for my $chain ( @{$builtins{$table}} ) {
 		log_rule_limit
 		    $config{LOGALLNEW} ,
diff --git a/Shorewall/Perl/Shorewall/Rules.pm b/Shorewall/Perl/Shorewall/Rules.pm
index 0b8d80519..726bdd31a 100644
--- a/Shorewall/Perl/Shorewall/Rules.pm
+++ b/Shorewall/Perl/Shorewall/Rules.pm
@@ -460,7 +460,7 @@ sub process_policies()
     my $firewall = firewall_zone;
     our @zonelist = $config{EXPAND_POLICIES} ? all_zones : ( all_zones, 'all' );
 
-    for my $option qw( DROP_DEFAULT REJECT_DEFAULT ACCEPT_DEFAULT QUEUE_DEFAULT NFQUEUE_DEFAULT) {
+    for my $option ( qw( DROP_DEFAULT REJECT_DEFAULT ACCEPT_DEFAULT QUEUE_DEFAULT NFQUEUE_DEFAULT) ) {
 	my $action = $config{$option};
 	next if $action eq 'none';
 	my $actiontype = $targets{$action};