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

A couple of corrections to the IP[6]TABLE transparency change

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2016-01-04 14:13:58 -08:00
parent c91b78a875
commit e695e08009
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall/Perl/Shorewall/Chains.pm
View File

@ -7491,7 +7491,7 @@ sub expand_rule( $$$$$$$$$$$$;$ )
$loglevel = validate_level( $loglevel );
$logtag = '' unless defined $logtag;
}
} elsif ( $disposition eq 'LOG' ) {
} elsif ( $disposition eq 'LOG' && ! $usergenerated ) {
fatal_error "LOG requires a level";
}
#

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

@ -2212,7 +2212,10 @@ sub split_line2( $$;$$$ ) {
$pairs = '';
}
fatal_error "Shorewall Configuration file entries may not contain double quotes, single back quotes or backslashes" if $columns =~ /["`\\]/;
unless ( $currline =~ /^\s*IP6?TABLES\(.*\)/ ) {
fatal_error "Shorewall Configuration file entries may not contain double quotes, single back quotes or backslashes" if $columns =~ /["`\\]/;
}
fatal_error "Non-ASCII gunk in file" if $columns =~ /[^\s[:print:]]/;
my @line = split_columns( $columns );