From e2b029b0ba816e1fc8667625e7a3f33cfd7b47cb Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sun, 7 Oct 2012 17:00:35 -0700 Subject: [PATCH] More hosts file corrections. Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/IPAddrs.pm | 6 +++++- Shorewall/Perl/Shorewall/Zones.pm | 8 +------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Shorewall/Perl/Shorewall/IPAddrs.pm b/Shorewall/Perl/Shorewall/IPAddrs.pm index 7bd1d84be..ca255f7d8 100644 --- a/Shorewall/Perl/Shorewall/IPAddrs.pm +++ b/Shorewall/Perl/Shorewall/IPAddrs.pm @@ -228,6 +228,8 @@ sub validate_4range( $$ ) { my $last = decodeaddr $high; fatal_error "Invalid IP Range ($low-$high)" unless $first <= $last; + + "$low-$high"; } sub validate_4host( $$ ) { @@ -690,11 +692,13 @@ sub validate_6range( $$ ) { while ( @low ) { my ( $l, $h) = ( shift @low, shift @high ); next if hex "0x$l" == hex "0x$h"; - return 1 if hex "0x$l" < hex "0x$h"; + return "$low-$high" if hex "0x$l" < hex "0x$h"; last; } fatal_error "Invalid IPv6 Range ($low-$high)"; + + } sub validate_6host( $$ ) { diff --git a/Shorewall/Perl/Shorewall/Zones.pm b/Shorewall/Perl/Shorewall/Zones.pm index 6bbb421ba..135d70953 100644 --- a/Shorewall/Perl/Shorewall/Zones.pm +++ b/Shorewall/Perl/Shorewall/Zones.pm @@ -763,12 +763,6 @@ sub add_group_to_zone($$$$$) $new = \@exclusions; } - if ( $host =~ /-/ ) { - &validate_range( split('-', $host, 2 ) ) - } else { - $host = validate_net( $host, 1 ) unless $host =~ /^\+/; - } - unless ( $switched ) { if ( $type == $zonetype ) { fatal_error "Duplicate Host Group ($interface:$host) in zone $zone" if $interfaces{$interface}{zone} eq $zone; @@ -791,7 +785,7 @@ sub add_group_to_zone($$$$$) fatal_error "Invalid ipset name ($host)" unless $host =~ /^\+(6_)?[a-zA-Z][-\w]*$/; require_capability( 'IPSET_MATCH', 'Ipset names in host lists', ''); } else { - validate_host $host, 0; + $host = validate_host $host, 0; } push @$new, $host;