From d0fd40ae0bb7fad5506570a13f87a6045906d8b9 Mon Sep 17 00:00:00 2001 From: teastep Date: Sat, 2 Feb 2008 16:59:59 +0000 Subject: [PATCH] More cleanup of validate_interface_file() git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@8135 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall-perl/Shorewall/Zones.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Shorewall-perl/Shorewall/Zones.pm b/Shorewall-perl/Shorewall/Zones.pm index 5bd711550..1dac67773 100644 --- a/Shorewall-perl/Shorewall/Zones.pm +++ b/Shorewall-perl/Shorewall/Zones.pm @@ -607,9 +607,9 @@ sub validate_interfaces_file( $ ) ( $interface, my ($port, $extra) ) = split /:/ , $interface, 3; - fatal_error "Invalid INTERFACE" if defined $extra || ! $interface; + fatal_error "Invalid INTERFACE (" . join (':', $interface, $port, $extra ) . ')' if defined $extra || ! $interface; - fatal_error "Invalid Interface Name ($interface)" if $interface eq '+'; + fatal_error "Invalid Interface Name (+)" if $interface eq '+'; if ( defined $port ) { fatal_error qq("Virtual" interfaces are not supported -- see http://www.shorewall.net/Shorewall_and_Aliased_Interfaces.html) if $port =~ /^\d+$/; @@ -741,7 +741,7 @@ sub validate_interfaces_file( $ ) my @networks = allipv4; - add_group_to_zone( $zone, $zoneref->{type}, $interface, \@networks, $optionsref ) if $zone && @networks; + add_group_to_zone( $zone, $zoneref->{type}, $interface, \@networks, $optionsref ) if $zone; $interfaces{$interface}{zone} = $zone; #Must follow the call to add_group_to_zone()