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

Fix setting of ORIGINAL_POLICY_MATCH

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6134 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-04-27 15:15:13 +00:00
parent 213eca848a
commit 69be038583
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,6 +66,7 @@ our @VERSION = 1.00;
our %globals = ( SHAREDIR => '/usr/share/shorewall' , our %globals = ( SHAREDIR => '/usr/share/shorewall' ,
CONFDIR => '/etc/shorewall', CONFDIR => '/etc/shorewall',
SHAREDIRPL => '/usr/share/shorewall-perl/', SHAREDIRPL => '/usr/share/shorewall-perl/',
ORIGINAL_POLICY_MATCH => '',
LOGPARMS => '', LOGPARMS => '',
TC_SCRIPT => '', TC_SCRIPT => '',
VERSION => '3.9.4', VERSION => '3.9.4',
@ -158,7 +159,6 @@ our %config =
MACLIST_DISPOSITION => undef, MACLIST_DISPOSITION => undef,
TCP_FLAGS_DISPOSITION => undef, TCP_FLAGS_DISPOSITION => undef,
BLACKLIST_DISPOSITION => undef, BLACKLIST_DISPOSITION => undef,
ORIGINAL_POLICY_MATCH => undef,
); );
# #
# Config options and global settings that are to be copied to object # Config options and global settings that are to be copied to object
@ -839,7 +839,6 @@ sub get_configuration( $ ) {
open_file 'capabilities' or fatal_error "Compiling under an ordinary user id requires a capabilities file"; open_file 'capabilities' or fatal_error "Compiling under an ordinary user id requires a capabilities file";
} }
$globals{ORIGINAL_POLICY_MATCH} = $capabilities{POLICY_MATCH};
# #
# If we successfully called open_file above, then this loop will read the capabilities file. # If we successfully called open_file above, then this loop will read the capabilities file.
@ -859,6 +858,8 @@ sub get_configuration( $ ) {
} }
} }
$globals{ORIGINAL_POLICY_MATCH} = $capabilities{POLICY_MATCH};
if ( $config{LOGRATE} || $config{LOGBURST} ) { if ( $config{LOGRATE} || $config{LOGBURST} ) {
$globals{LOGLIMIT} = '-m limit'; $globals{LOGLIMIT} = '-m limit';
$globals{LOGLIMIT} .= " --limit $config{LOGRATE}" if $config{LOGRATE}; $globals{LOGLIMIT} .= " --limit $config{LOGRATE}" if $config{LOGRATE};