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

Another ':' parsing issue

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@8362 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2008-03-26 15:56:50 +00:00
parent c0dd4f3911
commit 5288b1d64d
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall-common/changelog.txt
View File

@ -14,7 +14,7 @@ Changes in 4.1.7
7) Fix priority mingling in tc filters.
8) Fix policy parsing.
8) Fix ":" parsing errors.
Changes in 4.1.6

3
Shorewall-common/releasenotes.txt
View File

@ -92,6 +92,9 @@ Problems corrected in Shorewall-perl 4.1.7.
4) A POLICY of ":" in /etc/shorewall/policy would produce Perl
run-time errors.
6) An INTERFACE of ":" in /etc/shorewall/interfaces would produce Perl
run-time errors.
New Features in 4.1.7.
1) If an interface fails when using balanced multi-ISP routing, the

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

@ -598,7 +598,7 @@ sub validate_interfaces_file( $ )
$first_entry = 0;
}
my ($zone, $interface, $networks, $options ) = split_line 2, 4, 'interfaces file';
my ($zone, $originalinterface, $networks, $options ) = split_line 2, 4, 'interfaces file';
my $zoneref;
my $bridge = '';
@ -614,9 +614,9 @@ sub validate_interfaces_file( $ )
$networks = '' if $networks eq '-';
$options = '' if $options eq '-';
( $interface, my ($port, $extra) ) = split /:/ , $interface, 3;
my ($interface, $port, $extra) = split /:/ , $originalinterface, 3;
fatal_error "Invalid INTERFACE (" . join (':', $interface, $port, $extra ) . ')' if defined $extra || ! $interface;
fatal_error "Invalid INTERFACE ($originalinterface)" if ! $interface || defined $extra;
fatal_error "Invalid Interface Name (+)" if $interface eq '+';