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

Fix the level merge code -- again

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5468 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-03-08 21:58:46 +00:00
parent 018cff4896
commit ee8c4f7495
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
New/compiler.pl
View File

@ -1084,17 +1084,18 @@ sub merge_levels ($$) {
my $target = $subparts[0];
push @subparts, '' while @subparts < 3; #Avoid undefined values
push @subparts, '' while @subparts < 3; #Avoid undefined value
s
my $level = $supparts[1];
if ( $subparts == 3 ) {
if ( @supparts == 3 ) {
return "$target:none!:$supparts[2]" if $level eq 'none!';
return "$target:$level:$supparts[2]" if $level =~ /!$/;
return $subordinate if $subparts >= 2;
return "$target:$level";
}
if ( $subparts == 2 ) {
if ( @supparts == 2 ) {
return "$target:none!" if $level eq 'none!';
return "$target:$level" if ($level =~ /!$/) || ($subparts < 2);
}