From 1ff093b1c00f49c8768e73206ec7564b2a8d705a Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sat, 21 Mar 2009 22:46:16 +0000
Subject: [PATCH] Minor tweak to Shorewall::Zones

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

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9724 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/Perl/Shorewall/Zones.pm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Shorewall/Perl/Shorewall/Zones.pm b/Shorewall/Perl/Shorewall/Zones.pm
index bc75af9b8..3cef05310 100644
--- a/Shorewall/Perl/Shorewall/Zones.pm
+++ b/Shorewall/Perl/Shorewall/Zones.pm
@@ -201,7 +201,7 @@ sub parse_zone_option_list($$)
     #
     # Hash of options that have their own key in the returned hash.
     #
-    my %key = ( mss => "mss" );
+    my %key = ( mss => 'mss' );
 
     my ( $list, $zonetype ) = @_;
     my %h;
@@ -284,8 +284,6 @@ sub determine_zones()
 	fatal_error "Invalid zone name ($zone)"        if $reservedName{$zone} || $zone =~ /^all2|2all$/;
 	fatal_error( "Duplicate zone name ($zone)" ) if $zones{$zone};
 
-	$type = IP unless $type;
-
 	if ( $type =~ /ipv4/i ) {
 	    fatal_error "Invalid zone type ($type)" if $family == F_IPV6;
 	    $type = IP;
@@ -332,6 +330,7 @@ sub determine_zones()
 			  hosts      => {}
 			};
 	push @z, $zone;
+
     }
 
     fatal_error "No firewall zone defined" unless $firewall_zone;
@@ -588,7 +587,7 @@ sub all_zones() {
 }
 
 sub non_firewall_zones() {
-   grep ( $zones{$_}{type} != FIREWALL  ,  @zones );
+   grep ( $zones{$_}{type} != FIREWALL ,  @zones );
 }
 
 sub complex_zones() {