From cf3650bbe3ee27e51468e17b311ebcb07441636e Mon Sep 17 00:00:00 2001 From: teastep Date: Mon, 7 May 2007 22:20:00 +0000 Subject: [PATCH] rename ipseczones() to haveipseczones() git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6274 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall-perl/Shorewall/Hosts.pm | 2 +- Shorewall-perl/Shorewall/Zones.pm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Shorewall-perl/Shorewall/Hosts.pm b/Shorewall-perl/Shorewall/Hosts.pm index 447bcf70c..33462500f 100644 --- a/Shorewall-perl/Shorewall/Hosts.pm +++ b/Shorewall-perl/Shorewall/Hosts.pm @@ -125,7 +125,7 @@ sub validate_hosts_file() progress_message " Host \"$line\" validated"; } - $capabilities{POLICY_MATCH} = '' unless $ipsec || ipseczones; + $capabilities{POLICY_MATCH} = '' unless $ipsec || haveipseczones; } # # Returns a reference to a array of host entries. Each entry is a diff --git a/Shorewall-perl/Shorewall/Zones.pm b/Shorewall-perl/Shorewall/Zones.pm index e14beb6a4..949507e19 100644 --- a/Shorewall-perl/Shorewall/Zones.pm +++ b/Shorewall-perl/Shorewall/Zones.pm @@ -39,7 +39,7 @@ our @EXPORT = qw( NOTHING determine_zones zone_report dump_zone_contents - ipseczones + haveipseczones @zones %zones @@ -286,7 +286,7 @@ sub determine_zones() # # Return true of we have any ipsec zones # -sub ipseczones() { +sub haveipseczones() { for my $zoneref ( values %zones ) { return 1 if $zoneref->{type} eq 'ipsec4'; }