Merge branch '4.5.4'

Conflicts:
	Shorewall/Perl/Shorewall/Zones.pm
This commit is contained in:
Tom Eastep 2012-06-02 11:41:45 -07:00
commit 7ff15b0625

View File

@ -1458,9 +1458,9 @@ sub all_plain_interfaces() {
} }
return @plain2 unless @wild1; return @plain2 unless @wild1;
@plain1 = (); @plain1 = ();
NAME: NAME:
for my $name ( @plain2) { for my $name ( @plain2) {
for ( @wild2 ) { for ( @wild2 ) {