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

Fix 'check -r' output when OPTIMIZE=8 or OPTIMIZE=9

Browse Source
This commit is contained in:
Tom Eastep 2011-01-21 06:52:58 -08:00
parent 20cd9848f6
commit 3a5d664305
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Shorewall/Perl/Shorewall/Compiler.pm
View File

@ -782,7 +782,7 @@ sub compiler {
# #
generate_matrix; generate_matrix;
if ( $config{OPTIMIZE} & 0xD ) { if ( $config{OPTIMIZE} & 0xE ) {
progress_message2 'Optimizing Ruleset...'; progress_message2 'Optimizing Ruleset...';
# #
# Optimize Policy Chains # Optimize Policy Chains
@ -851,7 +851,7 @@ sub compiler {
# #
generate_matrix; generate_matrix;
if ( $config{OPTIMIZE} & 6 ) { if ( $config{OPTIMIZE} & 0xE ) {
progress_message2 'Optimizing Ruleset...'; progress_message2 'Optimizing Ruleset...';
# #
# Optimize Policy Chains # Optimize Policy Chains
@ -860,7 +860,7 @@ sub compiler {
# #
# Ruleset Optimization # Ruleset Optimization
# #
optimize_ruleset if $config{OPTIMIZE} & 4; optimize_ruleset if $config{OPTIMIZE} & 0xC;
} }
enable_script if $debug; enable_script if $debug;

2
Shorewall/changelog.txt
View File

@ -4,6 +4,8 @@ Changes in Shorewall 4.4.17 Beta 1
2) Fix empty SHELL variable handling with bash. 2) Fix empty SHELL variable handling with bash.
3) Correct 'check -r' with OPTIMIZE=8
Changes in Shorewall 4.4.17 Beta 1 Changes in Shorewall 4.4.17 Beta 1
1) Improve readability of logging logic in expand_rule(). 1) Improve readability of logging logic in expand_rule().

5
Shorewall/releasenotes.txt
View File

@ -28,6 +28,11 @@ Beta 2
variable was referenced in a config file on a system where /bin/sh variable was referenced in a config file on a system where /bin/sh
is the Bourne Again Shell (bash). is the Bourne Again Shell (bash).
4) In earlier versions. if OPTIMIZE=8 then the ruleset displayed by
'check -r' was the same as when OPTIMIZE=0
(unoptimized). Similarly, if OPTIMIZE=9 then the ruleset displayed
was the same as when OPTIMIZE=1.
Beta 1 Beta 1
1) Previously, a 'done.' message could be printed at the end of 1) Previously, a 'done.' message could be printed at the end of