extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-19 12:50:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.5.4'

Browse Source 
Conflicts:
	Shorewall/Perl/Shorewall/Config.pm
This commit is contained in:
Tom Eastep 2012-06-03 18:51:03 -07:00
commit 92a13ec87c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Shorewall/Perl/Shorewall/Zones.pm
View File

@ -568,6 +568,7 @@ sub determine_zones()
for ( @{$zones{$zone}{children}} ) { for ( @{$zones{$zone}{children}} ) {
next ZONE unless $ordered{$_}; next ZONE unless $ordered{$_};
} }
$ordered{$zone} = 1; $ordered{$zone} = 1;
push @zones, $zone; push @zones, $zone;
redo PUSHED; redo PUSHED;
@ -575,7 +576,7 @@ sub determine_zones()
} }
} }
assert( scalar @zones == scalar @z ); assert( @zones == @z );
} }