Improve shorewallrc variable expansion

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-03-24 21:34:24 -07:00
parent 7390789b5e
commit 173d29969d

View File

@ -2281,13 +2281,12 @@ sub process_shorewallrc() {
if ( $currentline =~ /^([a-zA-Z]\w*)=(.*)$/ ) { if ( $currentline =~ /^([a-zA-Z]\w*)=(.*)$/ ) {
my ($var, $val) = ($1, $2); my ($var, $val) = ($1, $2);
$val = $1 if $val =~ /^\"([^\"]*)\"$/; $val = $1 if $val =~ /^\"([^\"]*)\"$/;
expand_variables( $val, 1 ) if supplied $val; expand_variables( $val, 1 ) if supplied $val && $var ne 'PRODUCT';
$shorewallrc{$var} = $val; $shorewallrc{$var} = $val;
} else { } else {
fatal_error "Unrecognized shorewallrc entry"; fatal_error "Unrecognized shorewallrc entry";
} }
} }
} }
} }