extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-03-08 19:42:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add a few comments

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2011-06-18 16:55:00 -07:00
parent d66c7d478e
commit 55242d1ed6
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,6 +208,9 @@ our %globals;
# From shorewall.conf file - exported to other modules. # From shorewall.conf file - exported to other modules.
# #
our %config; our %config;
#
# Raw values from shorewall.conf - used to upgrade the config file
#
my %rawconfig; my %rawconfig;
# #
# Config options and global settings that are to be copied to output script # Config options and global settings that are to be copied to output script
@ -2854,7 +2857,9 @@ sub process_shorewall_conf() {
open_file $file; open_file $file;
first_entry "Processing $file..."; first_entry "Processing $file...";
#
# Don't expand shell variables
#
while ( read_a_line(0,0) ) { while ( read_a_line(0,0) ) {
if ( $currentline =~ /^\s*([a-zA-Z]\w*)=(.*?)\s*$/ ) { if ( $currentline =~ /^\s*([a-zA-Z]\w*)=(.*?)\s*$/ ) {
my ($var, $val) = ($1, $2); my ($var, $val) = ($1, $2);
@ -2874,7 +2879,9 @@ sub process_shorewall_conf() {
} else { } else {
fatal_error "$file does not exist!"; fatal_error "$file does not exist!";
} }
#
# Now that we have the raw values stored, we expand shell variables and store the expanded values
#
while ( my ( $opt, $v ) = each %rawconfig ) { while ( my ( $opt, $v ) = each %rawconfig ) {
my $count = 0; my $count = 0;
@ -2902,7 +2909,6 @@ sub process_shorewall_conf() {
$config{$opt} = $v; $config{$opt} = $v;
} }
} }
# #