mirror of
https://gitlab.com/shorewall/code.git
synced 2025-06-20 01:37:59 +02:00
Fix DEFAULTS
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
parent
af1898b17b
commit
2549982528
@ -73,7 +73,7 @@ my @builtins;
|
|||||||
#
|
#
|
||||||
# Commands that can be embedded in a basic rule and how many total tokens on the line (0 => unlimited).
|
# Commands that can be embedded in a basic rule and how many total tokens on the line (0 => unlimited).
|
||||||
#
|
#
|
||||||
my $rule_commands = { COMMENT => 0, FORMAT => 2, SECTION => 2, DEFAULT => 2 };
|
my $rule_commands = { COMMENT => 0, FORMAT => 2, SECTION => 2, DEFAULTS => 2 };
|
||||||
|
|
||||||
use constant { MAX_MACRO_NEST_LEVEL => 5 };
|
use constant { MAX_MACRO_NEST_LEVEL => 5 };
|
||||||
|
|
||||||
@ -1565,6 +1565,11 @@ sub process_macro ( $$$$$$$$$$$$$$$$$ ) {
|
|||||||
next;
|
next;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ( $format == 2 && $target eq 'DEFAULTS' ) {
|
||||||
|
default_params( split_list $source, 'defaults' );
|
||||||
|
next;
|
||||||
|
}
|
||||||
|
|
||||||
$mtarget = merge_levels $target, $mtarget;
|
$mtarget = merge_levels $target, $mtarget;
|
||||||
|
|
||||||
if ( $mtarget =~ /^PARAM(:.*)?$/ ) {
|
if ( $mtarget =~ /^PARAM(:.*)?$/ ) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user