Tweak the process_action() changes

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

View File

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