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

Correct issue in the compiler

Browse Source
This commit is contained in:
Tom Eastep
2011-03-11 12:13:55 -08:00
parent 114295952e
commit f8b8f58014
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -404,7 +404,7 @@ sub initialize( $ ) {
#
# Misc Globals
#
%globals = ( SHAREDIRPL => '/usr/share/shorewall/' ,
%globals = ( SHAREDIRPL => $defaults{shorewall}{share} . 'configpath' ,
CONFDIR => '/etc/shorewall', # Run-time configuration directory
CONFIGDIR => '', # Compile-time configuration directory (location of $product.conf)
LOGPARMS => '',
@@ -657,14 +657,14 @@ sub initialize( $ ) {
%actparms = ();
if ( $family == F_IPV4 ) {
$globals{SHAREDIR} = '/usr/share/shorewall';
$globals{CONFDIR} = '/etc/shorewall';
$globals{SHAREDIR} = $defaults{shorewall}{share} . 'shorewall';
$globals{CONFDIR} = $defaults{shorewall}{config} . 'shorewall';
$globals{PRODUCT} = 'shorewall';
$config{IPTABLES} = undef;
$validlevels{ULOG} = 'ULOG',
} else {
$globals{SHAREDIR} = '/usr/share/shorewall6';
$globals{CONFDIR} = '/etc/shorewall6';
$globals{SHAREDIR} = $defaults{shorewall6}{share} . 'shorewall6';
$globals{CONFDIR} = $defaults{shorewall6}{config} . 'shorewall6';
$globals{PRODUCT} = 'shorewall6';
$config{IP6TABLES} = undef;
}