holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

More careful editing of the hosts file

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6738 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-07-01 23:37:45 +00:00
parent fbccbb3368
commit 516f3d99ad
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Shorewall-perl/Shorewall/IPAddrs.pm
View File

@ -34,6 +34,7 @@ our @EXPORT = qw( ALLIPv4
validate_address validate_address
validate_net validate_net
validate_host
validate_range validate_range
ip_range_explicit ip_range_explicit
@ -149,4 +150,14 @@ sub ip_range_explicit( $ ) {
@result; @result;
} }
sub validate_host( $ ) {
my $host = $_[0];
if ( $host =~ /^(\d+\.\d+\.\d+\.\d+)-(\d+\.\d+\.\d+\.\d+)$/ ) {
validate_range $1, $2;
} else {
validate_net( $host );
}
}
1; 1;

6
Shorewall-perl/Shorewall/Interfaces.pm
View File

@ -123,6 +123,12 @@ sub add_group_to_zone($$$$$)
} }
} }
if ( $host =~ /^\+/ ) {
fatal_error "Invalid ipset name ($host)" unless $host =~ /^\+[a-zA-Z]\w*$/;
} else {
validate_host $host;
}
push @$new, $switched ? "$interface:$host" : $host; push @$new, $switched ? "$interface:$host" : $host;
} }