From 24f61c69c73fec23f000c1d12e94071060e23cc9 Mon Sep 17 00:00:00 2001 From: teastep Date: Thu, 15 Mar 2007 02:53:07 +0000 Subject: [PATCH] Give 'do_initialize' a more accurate name git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5541 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- New/Shorewall/Config.pm | 4 ++-- New/compiler.pl | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/New/Shorewall/Config.pm b/New/Shorewall/Config.pm index b4af6be98..a3b132ab1 100644 --- a/New/Shorewall/Config.pm +++ b/New/Shorewall/Config.pm @@ -5,7 +5,7 @@ use warnings; use Shorewall::Common; our @ISA = qw(Exporter); -our @EXPORT = qw(find_file do_initialize report_capabilities propagateconfig append_file %config %env %capabilities ); +our @EXPORT = qw(find_file get_configuration report_capabilities propagateconfig append_file %config %env %capabilities ); our @EXPORT_OK = (); our @VERSION = 1.00; @@ -229,7 +229,7 @@ sub report_capabilities() { # # Read the shorewall.conf file and establish global hashes %config and %env. # -sub do_initialize() { +sub get_configuration() { my $file = find_file 'shorewall.conf'; if ( -f $file ) { diff --git a/New/compiler.pl b/New/compiler.pl index e3f04be2c..dc8a35c0a 100755 --- a/New/compiler.pl +++ b/New/compiler.pl @@ -1659,6 +1659,8 @@ $ENV{VERBOSE} = 2 if $ENV{DEBUG}; # # Get shorewall.conf and capabilities. # -do_initialize; - +get_configuration; +# +# Compile/Check the configuration. +# compile_firewall $ARGV[0];