extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-23 19:21:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make missing capabilties file error messages friendlier

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6091 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-04-23 20:44:24 +00:00
parent 593828a24a
commit 92a4483f88
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,6 +64,7 @@ our %globals = ( SHAREDIR => '/usr/share/shorewall' ,
CONFDIR => '/etc/shorewall', CONFDIR => '/etc/shorewall',
SHAREDIRPL => '/usr/share/shorewall-perl/', SHAREDIRPL => '/usr/share/shorewall-perl/',
LOGPARMS => '', LOGPARMS => '',
TC_SCRIPT => '',
VERSION => '3.9.4', VERSION => '3.9.4',
); );
@ -778,8 +779,10 @@ sub get_configuration( $ ) {
unless ( open_file 'capabilities' ) { unless ( open_file 'capabilities' ) {
determine_capabilities; determine_capabilities;
} }
} else { } elsif ( $export ) {
fatal_error "The -e flag requires a capabilities file" unless open_file 'capabilities'; fatal_error "The -e flag requires a capabilities file" unless open_file 'capabilities';
} else {
fatal_error "Compiling under an ordinary user id requires a capabilities file" unless open_file 'capabilities';
} }
$globals{ORIGINAL_POLICY_MATCH} = $capabilities{POLICY_MATCH}; $globals{ORIGINAL_POLICY_MATCH} = $capabilities{POLICY_MATCH};
@ -910,8 +913,6 @@ sub get_configuration( $ ) {
$config{TCP_FLAGS_DISPOSITION} = 'DROP'; $config{TCP_FLAGS_DISPOSITION} = 'DROP';
} }
$globals{TC_SCRIPT} = '';
default 'TC_ENABLED' , 'Internal'; default 'TC_ENABLED' , 'Internal';
if ( $val = "\L$config{TC_ENABLED}" ) { if ( $val = "\L$config{TC_ENABLED}" ) {