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

Correct new directives with respect to omitting

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2017-03-05 12:09:54 -08:00
parent 80d93235b5
commit 356d3fa2dd
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
1 changed files with 49 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
Shorewall/Perl/Shorewall/Config.pm
View File

@ -2995,58 +2995,70 @@ sub process_compiler_directive( $$$$ ) {
} , } ,
ERROR => sub() { ERROR => sub() {
directive_error( evaluate_expression( $expression , unless ( $omitting ) {
$filename , directive_error( evaluate_expression( $expression ,
$linenumber , $filename ,
1 ) , $linenumber ,
$actparams{callfile} , 1 ) ,
$actparams{callline} ) unless $omitting; $actparams{callfile} ,
$actparams{callline} ) unless $omitting;
}
} , } ,
WARNING => sub() { WARNING => sub() {
directive_warning( $config{VERBOSE_MESSAGES} , unless ( $omitting ) {
evaluate_expression( $expression , directive_warning( $config{VERBOSE_MESSAGES} ,
$filename , evaluate_expression( $expression ,
$linenumber , $filename ,
1 ), $linenumber ,
$actparams{callfile} , 1 ),
$actparams{callline} ) unless $omitting; $actparams{callfile} ,
$actparams{callline} ) unless $omitting;
}
} , } ,
INFO => sub() { INFO => sub() {
directive_info( $config{VERBOSE_MESSAGES} , unless ( $omitting ) {
evaluate_expression( $expression , directive_info( $config{VERBOSE_MESSAGES} ,
$filename , evaluate_expression( $expression ,
$linenumber , $filename ,
1 ), $linenumber ,
$actparams{callfile} , 1 ),
$actparams{callline} ) unless $omitting; $actparams{callfile} ,
$actparams{callline} ) unless $omitting;
}
} , } ,
'WARNING!' => sub() { 'WARNING!' => sub() {
directive_warning( ! $config{VERBOSE_MESSAGES} , unless ( $omitting ) {
evaluate_expression( $expression , directive_warning( ! $config{VERBOSE_MESSAGES} ,
$filename , evaluate_expression( $expression ,
$linenumber , $filename ,
1 ), $linenumber ,
$actparams{callfile} , 1 ),
$actparams{callline} ) unless $omitting; $actparams{callfile} ,
$actparams{callline} ) unless $omitting;
}
} , } ,
'INFO!' => sub() { 'INFO!' => sub() {
directive_info( ! $config{VERBOSE_MESSAGES} , unless ( $omitting ) {
evaluate_expression( $expression , directive_info( ! $config{VERBOSE_MESSAGES} ,
$filename , evaluate_expression( $expression ,
$linenumber , $filename ,
1 ), $linenumber ,
$actparams{callfile} , 1 ),
$actparams{callline} ) unless $omitting; $actparams{callfile} ,
$actparams{callline} ) unless $omitting;
}
} , } ,
REQUIRE => sub() { REQUIRE => sub() {
fatal_error "?REQUIRE may only be used within action files" unless $actparams{0}; unless ( $omitting ) {
fatal_error "Unknown capability ($expression}" unless $capabilities{$expression}; fatal_error "?REQUIRE may only be used within action files" unless $actparams{0};
require_capability( $expression, "The $actparams{action} action", 's' ); fatal_error "Unknown capability ($expression)" unless $capdesc{$expression};
require_capability( $expression, "The $actparams{action} action", 's' );
}
} , } ,
); );