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

Merge branch '4.5.13'

Browse Source
This commit is contained in:
Tom Eastep 2013-02-10 09:05:41 -08:00
commit 8b4349b356
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -672,7 +672,9 @@ sub policy_rules( $$$$$ ) {
if ( $default && $default ne 'none' ) { if ( $default && $default ne 'none' ) {
my ( $action ) = split ':', $default; my ( $action ) = split ':', $default;
if ( ( $targets{$action} || 0 ) == INLINE ) { my ( $basicaction, $param ) = get_target_param $action;
if ( ( $targets{$basicaction} || 0 ) == INLINE ) {
# #
# Default action is an inline # Default action is an inline
# #
@ -1763,9 +1765,8 @@ sub process_action($$) {
# #
sub use_policy_action( $$ ) { sub use_policy_action( $$ ) {
my $ref = use_action( $_[0] ); my $ref = use_action( $_[0] );
if ( $ref ) { if ( $ref ) {
process_action( $ref, $_[1] ); delete $usedactions{$ref->{action}} if process_action( $ref, $_[1] );
} else { } else {
$ref = $usedactions{$_[0]}; $ref = $usedactions{$_[0]};
} }