From 15eec2467280d247749da046235a65716535a7b1 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Thu, 12 Aug 2010 15:15:19 -0700
Subject: [PATCH] Simplify logic for generating all parent zones

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/Perl/Shorewall/Zones.pm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Shorewall/Perl/Shorewall/Zones.pm b/Shorewall/Perl/Shorewall/Zones.pm
index fc82a8ebd..c561a27d3 100644
--- a/Shorewall/Perl/Shorewall/Zones.pm
+++ b/Shorewall/Perl/Shorewall/Zones.pm
@@ -741,12 +741,10 @@ sub non_firewall_zones() {
 
 sub all_parent_zones() {
     #
-    # Although the firewall zone is a parent zone, we let the caller decide
+    # Although the firewall zone is technically a parent zone, we let the caller decide
     # if it is to be included or not.
     #
-    grep ( ! ( $zones{$_}->{type} == FIREWALL ||
-	       $zones{$_}->{type} == VSERVER  ||
-	       @{$zones{$_}{parents}} ) ,  @zones );
+    grep ( ! @{$zones{$_}{parents}} , off_firewall_zones );
 }
 
 sub complex_zones() {