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

Set PRODUCT before processing rc file.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-03-25 07:25:15 -07:00
parent 294babcfbb
commit 5aed14ffdc
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2276,19 +2276,14 @@ sub read_a_line1() {
sub process_shorewallrc() { sub process_shorewallrc() {
my $home = $ENV{HOME} || `echo ~`; my $home = $ENV{HOME} || `echo ~`;
$shorewallrc{PRODUCT} = $family == F_IPV4 ? 'shorewall' : 'shorewall6';
if ( $home && open_file "$home/.shorewallrc" ) { if ( $home && open_file "$home/.shorewallrc" ) {
while ( read_a_line1 ) { while ( read_a_line1 ) {
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;
if ( $var eq 'PRODUCT' ) {
$val = $globals{PRODUCT};
} elsif ( supplied $val ) {
expand_variables($val, 1 );
}
$shorewallrc{$var} = $val; $shorewallrc{$var} = $val;
} else { } else {
fatal_error "Unrecognized shorewallrc entry"; fatal_error "Unrecognized shorewallrc entry";