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

Ensure that the chain origin is used when there is no rule origin

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2016-02-03 10:43:10 -08:00
parent 916a392fb0
commit bd9e8142b9
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1254,6 +1254,8 @@ sub set_irule_comment( $$ ) {
our $rule_comments; our $rule_comments;
$ruleref->{origin} ||= $chainref->{origin};
if ( $rule_comments ) { if ( $rule_comments ) {
$ruleref->{comment} = $ruleref->{origin} || $comment; $ruleref->{comment} = $ruleref->{origin} || $comment;
} else { } else {
@ -6350,7 +6352,7 @@ sub log_rule_limit( $$$$$$$$;$ ) {
$ruleref = insert_rule1 ( $chainref , 0 , $matches . $prefix ); $ruleref = insert_rule1 ( $chainref , 0 , $matches . $prefix );
} }
$ruleref->{origin} = $origin ||= $chainref->{origin} if reftype $ruleref; $ruleref->{origin} = $origin if reftype( $ruleref ) && $origin;
$ruleref; $ruleref;
} }