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

Call 'ensure_config_path' from 'set_shorewall_dir'

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6686 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-06-27 00:15:58 +00:00
parent 379ed95564
commit 6823d5054b
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Shorewall-perl/Shorewall/Config.pm
View File

@ -339,13 +339,6 @@ sub fatal_error {
die " ERROR: @_$lineinfo\n";
}
#
# Set $shorewall_dir
#
sub set_shorewall_dir( $ ) {
$shorewall_dir = shift;
}
#
# Set $globals{CONFIG_PATH}
#
@ -951,6 +944,14 @@ sub ensure_config_path() {
}
}
#
# Set $shorewall_dir
#
sub set_shorewall_dir( $ ) {
$shorewall_dir = shift;
ensure_config_path;
}
#
# Small functions called by get_configuration. We separate them so profiling is more useful
#

2
Shorewall-perl/buildports.pl
View File

@ -70,8 +70,6 @@ set_config_path( '/etc/shorewall:/usr/share/shorewall' );
set_shorewall_dir($ARGV[0] || '/etc');
ensure_config_path;
our $date = localtime;
print <<"EOF";