From 69eaf8407808034536531e338e9734577f124645 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Thu, 12 Aug 2010 07:31:37 -0700
Subject: [PATCH] Fix bug with 'any'

---
 Shorewall/Perl/Shorewall/Zones.pm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Shorewall/Perl/Shorewall/Zones.pm b/Shorewall/Perl/Shorewall/Zones.pm
index dcfa920e3..fc82a8ebd 100644
--- a/Shorewall/Perl/Shorewall/Zones.pm
+++ b/Shorewall/Perl/Shorewall/Zones.pm
@@ -740,7 +740,13 @@ sub non_firewall_zones() {
 }
 
 sub all_parent_zones() {
-   grep ( ! @{$zones{$_}{parents}} ,  @zones );
+    #
+    # Although the firewall zone is 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 );
 }
 
 sub complex_zones() {