extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-15 20:24:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.5.0'

Browse Source
This commit is contained in:
Tom Eastep 2012-02-05 13:19:54 -08:00
commit a87a981a2e
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Shorewall/Perl/Shorewall/Config.pm
View File

@ -3484,11 +3484,13 @@ sub add_param( $$ ) {
sub export_params() { sub export_params() {
my $count = 0; my $count = 0;
while ( my ( $param, $value ) = each %params ) { for my $param ( sort keys %params ) {
# #
# Don't export params added by the compiler # Don't export params added by the compiler
# #
next if exists $compiler_params{$param}; next if exists $compiler_params{$param};
my $value = $params{$param};
# #
# Values in %params are generated from the output of 'export -p'. # Values in %params are generated from the output of 'export -p'.
# The different shells have different conventions for delimiting # The different shells have different conventions for delimiting

18
Shorewall/Perl/Shorewall/Rules.pm
View File

@ -144,8 +144,7 @@ sub initialize( $ ) {
# #
# These are set to 1 as sections are encountered. # These are set to 1 as sections are encountered.
# #
%sections = ( BLACKLIST => 0, %sections = ( ALL => 0,
ALL => 0,
ESTABLISHED => 0, ESTABLISHED => 0,
RELATED => 0, RELATED => 0,
NEW => 0 NEW => 0
@ -2309,15 +2308,13 @@ sub process_section ($) {
if ( $sect eq 'BLACKLIST' ) { if ( $sect eq 'BLACKLIST' ) {
fatal_error "The BLACKLIST section has been eliminated. Please move your BLACKLIST rules to the 'blrules' file"; fatal_error "The BLACKLIST section has been eliminated. Please move your BLACKLIST rules to the 'blrules' file";
} elsif ( $sect eq 'ALL' ) {
$sections{BLACKLIST} = 1;
} elsif ( $sect eq 'ESTABLISHED' ) { } elsif ( $sect eq 'ESTABLISHED' ) {
$sections{'BLACKLIST','ALL'} = ( 1, 1); $sections{ALL} = 1;
} elsif ( $sect eq 'RELATED' ) { } elsif ( $sect eq 'RELATED' ) {
@sections{'BLACKLIST','ALL','ESTABLISHED'} = ( 1, 1, 1); @sections{'ALL','ESTABLISHED'} = ( 1, 1);
finish_section 'ESTABLISHED'; finish_section 'ESTABLISHED';
} elsif ( $sect eq 'NEW' ) { } elsif ( $sect eq 'NEW' ) {
@sections{'BLACKLIST','ALL','ESTABLISHED','RELATED'} = ( 1, 1, 1, 1 ); @sections{'ALL','ESTABLISHED','RELATED'} = ( 1, 1, 1 );
finish_section ( ( $section eq 'RELATED' ) ? 'RELATED' : 'ESTABLISHED,RELATED' ); finish_section ( ( $section eq 'RELATED' ) ? 'RELATED' : 'ESTABLISHED,RELATED' );
} }
@ -2529,8 +2526,13 @@ sub classic_blacklist() {
# Process the BLRules and Rules Files # Process the BLRules and Rules Files
# #
sub process_rules() { sub process_rules() {
#
# Generate jumps to the classic blacklist chains
#
my $blrules = classic_blacklist; my $blrules = classic_blacklist;
#
# Process the blrules file
#
$section = 'BLACKLIST'; $section = 'BLACKLIST';
my $fn = open_file 'blrules'; my $fn = open_file 'blrules';