From f5c09a9e2ea7479a8033806846ab5eff4007faae Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Tue, 7 Feb 2012 07:38:07 -0800 Subject: [PATCH] Restore 'update -b' functionality Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Compiler.pm | 2 +- Shorewall/Perl/Shorewall/Rules.pm | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Compiler.pm b/Shorewall/Perl/Shorewall/Compiler.pm index 40275c6ee..96865d65c 100644 --- a/Shorewall/Perl/Shorewall/Compiler.pm +++ b/Shorewall/Perl/Shorewall/Compiler.pm @@ -791,7 +791,7 @@ sub compiler { # # Process the rules file. # - process_rules; + process_rules( $convert ); # # Add Tunnel rules. # diff --git a/Shorewall/Perl/Shorewall/Rules.pm b/Shorewall/Perl/Shorewall/Rules.pm index 2728d15c1..b051d5156 100644 --- a/Shorewall/Perl/Shorewall/Rules.pm +++ b/Shorewall/Perl/Shorewall/Rules.pm @@ -2525,11 +2525,13 @@ sub classic_blacklist() { # # Process the BLRules and Rules Files # -sub process_rules() { +sub process_rules( $ ) { + my $convert = shift; + my $blrules = 0; # # Generate jumps to the classic blacklist chains # - my $blrules = classic_blacklist; + $blrules = classic_blacklist unless $convert; # # Process the blrules file #