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

Correct $LOG_LEVEL expansion

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2017-03-10 10:23:17 -08:00
parent f7393314bd
commit 11286ea343
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5489,6 +5489,14 @@ sub process_shorewall_conf( $$ ) {
# Config file update requires that the option values not have # Config file update requires that the option values not have
# Shell variables expanded. We do that now. # Shell variables expanded. We do that now.
# #
# We must first make LOG_LEVEL a variable because the order in which
# the values are processed below is not the order in which they appear
# in the config file.
#
my %log_level = ( LOG_LEVEL => $config{LOG_LEVEL} );
add_variables( %log_level );
for ( values %config ) { for ( values %config ) {
if ( supplied $_ ) { if ( supplied $_ ) {
expand_variables( $_ ) unless /^'(.+)'$/; expand_variables( $_ ) unless /^'(.+)'$/;