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

Minor cleanup of the Config module

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2017-05-15 09:29:12 -07:00
parent eb26a467e9
commit 965a8e8f68
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -536,7 +536,7 @@ our %config_files = ( #accounting => 1,
tunnels => 1, tunnels => 1,
zones => 1 ); zones => 1 );
# #
# Options that involve the the AUDIT target # Options that involve the AUDIT target
# #
our @auditoptions = qw( BLACKLIST_DISPOSITION MACLIST_DISPOSITION TCP_FLAGS_DISPOSITION ); our @auditoptions = qw( BLACKLIST_DISPOSITION MACLIST_DISPOSITION TCP_FLAGS_DISPOSITION );
# #
@ -1168,7 +1168,7 @@ sub initialize( $;$$) {
# #
# Process the global shorewallrc file # Process the global shorewallrc file
# #
# Note: The build file executes this function passing only the protocol family # Note: The build script calls this function passing only the protocol family
# #
process_shorewallrc( $shorewallrc, process_shorewallrc( $shorewallrc,
$family == F_IPV4 ? 'shorewall' : 'shorewall6' $family == F_IPV4 ? 'shorewall' : 'shorewall6'
@ -1219,9 +1219,8 @@ sub compiletime() {
# Create 'currentlineinfo' # Create 'currentlineinfo'
# #
sub currentlineinfo() { sub currentlineinfo() {
my $linenumber = $currentlinenumber || 1;
if ( $currentfilename ) { if ( $currentfilename ) {
my $linenumber = $currentlinenumber || 1;
my $lineinfo = " $currentfilename "; my $lineinfo = " $currentfilename ";
if ( $linenumber eq 'EOF' ) { if ( $linenumber eq 'EOF' ) {