From 99e0a340b1371dac23cf0332e185a7c9dde39391 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Fri, 3 Feb 2012 07:29:13 -0800 Subject: [PATCH] Cosmetic changes to Zones.pm source Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Zones.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Shorewall/Perl/Shorewall/Zones.pm b/Shorewall/Perl/Shorewall/Zones.pm index 72af2d9d1..fc0c5508b 100644 --- a/Shorewall/Perl/Shorewall/Zones.pm +++ b/Shorewall/Perl/Shorewall/Zones.pm @@ -611,11 +611,14 @@ sub zone_report() for my $interface ( sort keys %$interfaceref ) { my $iref = $interfaces{$interface}; my $arrayref = $interfaceref->{$interface}; + for my $groupref ( @$arrayref ) { my $hosts = $groupref->{hosts}; + if ( $hosts ) { my $grouplist = join ',', ( @$hosts ); my $exclusions = join ',', @{$groupref->{exclusions}}; + $grouplist = join '!', ( $grouplist, $exclusions) if $exclusions; if ( $family == F_IPV4 ) { @@ -626,7 +629,6 @@ sub zone_report() $printed = 1; } } - } } } @@ -662,6 +664,7 @@ sub dump_zone_contents() { for my $interface ( sort keys %$interfaceref ) { my $iref = $interfaces{$interface}; my $arrayref = $interfaceref->{$interface}; + for my $groupref ( @$arrayref ) { my $hosts = $groupref->{hosts};