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

Tweak the process_action() changes

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2016-01-17 17:03:46 -08:00
parent ec6c233666
commit a945b3e0dd
1 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1799,9 +1799,10 @@ sub process_action(\$\$$) {
# were modified (and this function returns true
#
if ( my $result = pop_action_params( $oldparms ) ) {
if ( $result & PARMSMODIFIED ) {
return PARMSMODIFIED;
} else {
#
# Modified parameters trumps USEDCALLER
#
return PARMSMODIFIED if $result & PARMSMODIFIED;
#
# The chain uses @CALLER but doesn't modify the action parameters.
# We need to see if this chain has already called this action
@ -1835,9 +1836,6 @@ sub process_action(\$\$$) {
# New normalized target
#
${$wholeactionref} = $renormalized_action;
return 0;
}
}
0;