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

Earlier validation of log level used in action invocation

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6985 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-07-28 16:37:14 +00:00
parent 995412ff59
commit 65d3bc6e19
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Shorewall-perl/Shorewall/Actions.pm
View File

@ -35,7 +35,6 @@ our @ISA = qw(Exporter);
our @EXPORT = qw( merge_levels our @EXPORT = qw( merge_levels
isolate_basic_target isolate_basic_target
add_requiredby add_requiredby
createlogactionchain
createactionchain createactionchain
find_logactionchain find_logactionchain
process_actions1 process_actions1
@ -261,6 +260,10 @@ sub createlogactionchain( $$ ) {
my $actionref = $actions{$action}; my $actionref = $actions{$action};
my $chainref; my $chainref;
my ($lev, $tag) = split ':', $level;
validate_level $lev;
$chain = substr $chain, 0, 28 if ( length $chain ) > 28; $chain = substr $chain, 0, 28 if ( length $chain ) > 28;
while ( $chain_table{'%' . $chain . $actionref->{actchain}} ) { while ( $chain_table{'%' . $chain . $actionref->{actchain}} ) {
@ -269,8 +272,6 @@ sub createlogactionchain( $$ ) {
$actionref = new_action $action unless $actionref; $actionref = new_action $action unless $actionref;
$level = 'none' unless $level;
$logactionchains{"$action:$level"} = $chainref = new_chain 'filter', '%' . $chain . $actionref->{actchain}++; $logactionchains{"$action:$level"} = $chainref = new_chain 'filter', '%' . $chain . $actionref->{actchain}++;
mark_referenced $chainref; # Just in case the action body is empty. mark_referenced $chainref; # Just in case the action body is empty.

2
Shorewall-perl/Shorewall/Chains.pm
View File

@ -1274,7 +1274,7 @@ sub log_rule_limit( $$$$$$$$ ) {
my $prefix; my $prefix;
$level = validate_level $level; $level = validate_level $level; # Do this here again because this function can be called directly from user exits.
return 1 if $level eq ''; return 1 if $level eq '';