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

Revert "Make $update global in Config.pm"

Browse Source 
This reverts commit b9d0821acb.
This commit is contained in:
Tom Eastep 2019-03-17 08:02:53 -07:00
parent 60f2f3b0d0
commit 2f3f6ffa15
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -684,7 +684,6 @@ our $shorewall_dir; # Shorewall Directory; if non-empty, search here fi
our $debug; # Global debugging flag our $debug; # Global debugging flag
our $confess; # If true, use Carp to report errors with stack trace. our $confess; # If true, use Carp to report errors with stack trace.
our $update; # True if this is an update
our $family; # Protocol family (4 or 6) our $family; # Protocol family (4 or 6)
our $export; # True when compiling for export our $export; # True when compiling for export
@ -1192,7 +1191,6 @@ sub initialize( $;$$$) {
$debug = 0; $debug = 0;
$confess = 0; $confess = 0;
$update = 0;
%params = (); %params = ();
@ -4023,9 +4021,9 @@ sub read_a_line($) {
# #
handle_first_entry if $first_entry; handle_first_entry if $first_entry;
# #
# Save Raw Image if we are updating # Save Raw Image
# #
$rawcurrentline = $currentline if $update; $rawcurrentline = $currentline;
# #
# Expand Shell Variables using %params and %actparams # Expand Shell Variables using %params and %actparams
# #
@ -5595,8 +5593,8 @@ EOF
# #
# Small functions called by get_configuration. We separate them so profiling is more useful # Small functions called by get_configuration. We separate them so profiling is more useful
# #
sub process_shorewall_conf( $ ) { sub process_shorewall_conf( $$ ) {
my ( $annotate ) = @_; my ( $update, $annotate ) = @_;
my $file = find_file "$product.conf"; my $file = find_file "$product.conf";
my @vars; my @vars;
@ -6177,7 +6175,7 @@ sub convert_to_version_5_2() {
# #
sub get_configuration( $$$ ) { sub get_configuration( $$$ ) {
( my $export, $update, my $annotate ) = @_; my ( $export, $update, $annotate ) = @_;
$globals{EXPORT} = $export; $globals{EXPORT} = $export;
@ -6239,7 +6237,7 @@ sub get_configuration( $$$ ) {
get_params( $export ); get_params( $export );
process_shorewall_conf( $annotate ); process_shorewall_conf( $update, $annotate );
ensure_config_path; ensure_config_path;