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

Rename BLACKLIST_LOGLEVEL to BLACKLIST_LOG_LEVEL for consistent naming.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2013-02-12 07:47:02 -08:00
parent 84c5822c20
commit f44becdee1
15 changed files with 42 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -269,7 +269,7 @@ our %config;
# #
# Entries in shorewall.conf that have been renamed # Entries in shorewall.conf that have been renamed
# #
our %renamed = ( AUTO_COMMENT => 'AUTOCOMMENT' ); our %renamed = ( AUTO_COMMENT => 'AUTOCOMMENT', BLACKLIST_LOGLEVEL => 'BLACKLIST_LOG_LEVEL' );
# #
# Config options and global settings that are to be copied to output script # Config options and global settings that are to be copied to output script
# #
@ -665,7 +665,7 @@ sub initialize( $;$$) {
LOGRATE => undef, LOGRATE => undef,
LOGBURST => undef, LOGBURST => undef,
LOGALLNEW => undef, LOGALLNEW => undef,
BLACKLIST_LOGLEVEL => undef, BLACKLIST_LOG_LEVEL => undef,
RELATED_LOG_LEVEL => undef, RELATED_LOG_LEVEL => undef,
RFC1918_LOG_LEVEL => undef, RFC1918_LOG_LEVEL => undef,
MACLIST_LOG_LEVEL => undef, MACLIST_LOG_LEVEL => undef,
@ -5286,7 +5286,7 @@ sub get_configuration( $$$$ ) {
require_capability 'AUDIT_TARGET', "SMURF_DISPOSITION=$val", 's' if $val =~ /^A_/; require_capability 'AUDIT_TARGET', "SMURF_DISPOSITION=$val", 's' if $val =~ /^A_/;
default_log_level 'BLACKLIST_LOGLEVEL', ''; default_log_level 'BLACKLIST_LOG_LEVEL', '';
default_log_level 'MACLIST_LOG_LEVEL', ''; default_log_level 'MACLIST_LOG_LEVEL', '';
default_log_level 'TCP_FLAGS_LOG_LEVEL', ''; default_log_level 'TCP_FLAGS_LOG_LEVEL', '';
default_log_level 'RFC1918_LOG_LEVEL', ''; default_log_level 'RFC1918_LOG_LEVEL', '';

6
Shorewall/Perl/Shorewall/Misc.pm
View File

@ -199,7 +199,7 @@ sub setup_blacklist() {
my $zones1 = find_zones_by_option 'blacklist', 'out'; my $zones1 = find_zones_by_option 'blacklist', 'out';
my $chainref; my $chainref;
my $chainref1; my $chainref1;
my ( $level, $disposition ) = @config{'BLACKLIST_LOGLEVEL', 'BLACKLIST_DISPOSITION' }; my ( $level, $disposition ) = @config{'BLACKLIST_LOG_LEVEL', 'BLACKLIST_DISPOSITION' };
my $audit = $disposition =~ /^A_/; my $audit = $disposition =~ /^A_/;
my $target = $disposition eq 'REJECT' ? 'reject' : $disposition; my $target = $disposition eq 'REJECT' ? 'reject' : $disposition;
my $orig_target = $target; my $orig_target = $target;
@ -379,7 +379,7 @@ sub remove_blacklist( $ ) {
sub convert_blacklist() { sub convert_blacklist() {
my $zones = find_zones_by_option 'blacklist', 'in'; my $zones = find_zones_by_option 'blacklist', 'in';
my $zones1 = find_zones_by_option 'blacklist', 'out'; my $zones1 = find_zones_by_option 'blacklist', 'out';
my ( $level, $disposition ) = @config{'BLACKLIST_LOGLEVEL', 'BLACKLIST_DISPOSITION' }; my ( $level, $disposition ) = @config{'BLACKLIST_LOG_LEVEL', 'BLACKLIST_DISPOSITION' };
my $audit = $disposition =~ /^A_/; my $audit = $disposition =~ /^A_/;
my $target = $disposition eq 'REJECT' ? 'reject' : $disposition; my $target = $disposition eq 'REJECT' ? 'reject' : $disposition;
my $orig_target = $target; my $orig_target = $target;
@ -766,7 +766,7 @@ sub add_common_rules ( $ ) {
my @state = state_imatch( $globals{BLACKLIST_STATES} ); my @state = state_imatch( $globals{BLACKLIST_STATES} );
my $faststate = $config{RELATED_DISPOSITION} eq 'ACCEPT' && $config{RELATED_LOG_LEVEL} eq '' ? 'ESTABLISHED,RELATED' : 'ESTABLISHED'; my $faststate = $config{RELATED_DISPOSITION} eq 'ACCEPT' && $config{RELATED_LOG_LEVEL} eq '' ? 'ESTABLISHED,RELATED' : 'ESTABLISHED';
my $level = $config{BLACKLIST_LOGLEVEL}; my $level = $config{BLACKLIST_LOG_LEVEL};
my $rejectref = $filter_table->{reject}; my $rejectref = $filter_table->{reject};
if ( $config{DYNAMIC_BLACKLIST} ) { if ( $config{DYNAMIC_BLACKLIST} ) {

2
Shorewall/Perl/Shorewall/Rules.pm
View File

@ -3143,7 +3143,7 @@ sub process_rules( $ ) {
if ( $fn ) { if ( $fn ) {
first_entry( sub () { first_entry( sub () {
my ( $level, $disposition ) = @config{'BLACKLIST_LOGLEVEL', 'BLACKLIST_DISPOSITION' }; my ( $level, $disposition ) = @config{'BLACKLIST_LOG_LEVEL', 'BLACKLIST_DISPOSITION' };
my $audit = $disposition =~ /^A_/; my $audit = $disposition =~ /^A_/;
my $target = $disposition eq 'REJECT' ? 'reject' : $disposition; my $target = $disposition eq 'REJECT' ? 'reject' : $disposition;

2
Shorewall/Samples/Universal/shorewall.conf
View File

@ -21,7 +21,7 @@ VERBOSITY=1
# L O G G I N G # L O G G I N G
############################################################################### ###############################################################################
BLACKLIST_LOGLEVEL= BLACKLIST_LOG_LEVEL=
INVALID_LOG_LEVEL= INVALID_LOG_LEVEL=

2
Shorewall/Samples/one-interface/shorewall.conf
View File

@ -32,7 +32,7 @@ VERBOSITY=1
# L O G G I N G # L O G G I N G
############################################################################### ###############################################################################
BLACKLIST_LOGLEVEL= BLACKLIST_LOG_LEVEL=
INVALID_LOG_LEVEL= INVALID_LOG_LEVEL=

2
Shorewall/Samples/three-interfaces/shorewall.conf
View File

@ -30,7 +30,7 @@ VERBOSITY=1
# L O G G I N G # L O G G I N G
############################################################################### ###############################################################################
BLACKLIST_LOGLEVEL= BLACKLIST_LOG_LEVEL=
INVALID_LOG_LEVEL= INVALID_LOG_LEVEL=

2
Shorewall/Samples/two-interfaces/shorewall.conf
View File

@ -33,7 +33,7 @@ VERBOSITY=1
# L O G G I N G # L O G G I N G
############################################################################### ###############################################################################
BLACKLIST_LOGLEVEL= BLACKLIST_LOG_LEVEL=
INVALID_LOG_LEVEL= INVALID_LOG_LEVEL=

2
Shorewall/configfiles/shorewall.conf
View File

@ -21,7 +21,7 @@ VERBOSITY=1
# L O G G I N G # L O G G I N G
############################################################################### ###############################################################################
BLACKLIST_LOGLEVEL= BLACKLIST_LOG_LEVEL=
INVALID_LOG_LEVEL= INVALID_LOG_LEVEL=

20
Shorewall/manpages/shorewall.conf.xml
View File

@ -422,19 +422,17 @@
<varlistentry> <varlistentry>
<term><emphasis <term><emphasis
role="bold">BLACKLIST_LOGLEVEL=</emphasis>[<emphasis>log-level</emphasis>]</term> role="bold">BLACKLIST_LOG_LEVEL=</emphasis>[<emphasis>log-level</emphasis>]</term>
<listitem> <listitem>
<para>This parameter determines if packets from blacklisted hosts <para>Formerly named BLACKLIST_LOGLEVEL. This parameter determines
are logged and it determines the syslog level that they are to be if packets from blacklisted hosts are logged and it determines the
logged at. Its value is a syslog level (Example: syslog level that they are to be logged at. Its value is a syslog
BLACKLIST_LOGLEVEL=debug). If you do not assign a value or if you level (Example: BLACKLIST_LOG_LEVEL=debug). If you do not assign a
assign an empty value then packets from blacklisted hosts are not value or if you assign an empty value then packets from blacklisted
logged. The BLACKLIST_LOGLEVEL setting has no effect on entries in hosts are not logged. The setting determines the log level of
the BLACKLIST section of <ulink packets sent to the <emphasis role="bold">blacklog</emphasis> target
url="shorewall-rules.html">shorewall-rules</ulink> (5). It of <ulink
determines the log level of packets sent to the <emphasis
role="bold">blacklog</emphasis> target of <ulink
url="shorewall-blrules.html">shorewall-blrules</ulink>(5).</para> url="shorewall-blrules.html">shorewall-blrules</ulink>(5).</para>
</listitem> </listitem>
</varlistentry> </varlistentry>

2
Shorewall6/Samples6/Universal/shorewall6.conf
View File

@ -22,7 +22,7 @@ VERBOSITY=1
# L O G G I N G # L O G G I N G
############################################################################### ###############################################################################
BLACKLIST_LOGLEVEL= BLACKLIST_LOG_LEVEL=
INVALID_LOG_LEVEL= INVALID_LOG_LEVEL=

2
Shorewall6/Samples6/one-interface/shorewall6.conf
View File

@ -22,7 +22,7 @@ VERBOSITY=1
# L O G G I N G # L O G G I N G
############################################################################### ###############################################################################
BLACKLIST_LOGLEVEL= BLACKLIST_LOG_LEVEL=
INVALID_LOG_LEVEL= INVALID_LOG_LEVEL=

2
Shorewall6/Samples6/three-interfaces/shorewall6.conf
View File

@ -22,7 +22,7 @@ VERBOSITY=1
# L O G G I N G # L O G G I N G
############################################################################### ###############################################################################
BLACKLIST_LOGLEVEL= BLACKLIST_LOG_LEVEL=
INVALID_LOG_LEVEL= INVALID_LOG_LEVEL=

2
Shorewall6/Samples6/two-interfaces/shorewall6.conf
View File

@ -22,7 +22,7 @@ VERBOSITY=1
# L O G G I N G # L O G G I N G
############################################################################### ###############################################################################
BLACKLIST_LOGLEVEL= BLACKLIST_LOG_LEVEL=
INVALID_LOG_LEVEL= INVALID_LOG_LEVEL=

2
Shorewall6/configfiles/shorewall6.conf
View File

@ -22,7 +22,7 @@ VERBOSITY=1
# L O G G I N G # L O G G I N G
############################################################################### ###############################################################################
BLACKLIST_LOGLEVEL= BLACKLIST_LOG_LEVEL=
INVALID_LOG_LEVEL= INVALID_LOG_LEVEL=

25
Shorewall6/manpages/shorewall6.conf.xml
View File

@ -341,10 +341,7 @@
be dropped or REJECT if the packets are to be replied with an ICMP be dropped or REJECT if the packets are to be replied with an ICMP
port unreachable reply or a TCP RST (tcp only). If you do not assign port unreachable reply or a TCP RST (tcp only). If you do not assign
a value or if you assign an empty value then DROP is assumed. The a value or if you assign an empty value then DROP is assumed. The
BLACKLIST_DISPOSITION setting has no effect on entries in the setting determines the disposition of packets sent to the <emphasis
BLACKLIST section of <ulink
url="shorewall6-rules.html">shorewall6-rules</ulink> (5). It
determines the disposition of packets sent to the <emphasis
role="bold">blacklog</emphasis> target of <ulink role="bold">blacklog</emphasis> target of <ulink
url="shorewall6-blrules.html">shorewall6-blrules</ulink>(5).</para> url="shorewall6-blrules.html">shorewall6-blrules</ulink>(5).</para>
</listitem> </listitem>
@ -352,19 +349,17 @@
<varlistentry> <varlistentry>
<term><emphasis <term><emphasis
role="bold">BLACKLIST_LOGLEVEL=</emphasis>[<emphasis>log-level</emphasis>]</term> role="bold">BLACKLIST_LOG_LEVEL=</emphasis>[<emphasis>log-level</emphasis>]</term>
<listitem> <listitem>
<para>This parameter determines if packets from blacklisted hosts <para>Formerly named BLACKLIST_LOGLEVEL. This parameter determines
are logged and it determines the syslog level that they are to be if packets from blacklisted hosts are logged and it determines the
logged at. Its value is a syslog level (Example: syslog level that they are to be logged at. Its value is a syslog
BLACKLIST_LOGLEVEL=debug). If you do not assign a value or if you level (Example: BLACKLIST_LOG_LEVEL=debug). If you do not assign a
assign an empty value then packets from blacklisted hosts are not value or if you assign an empty value then packets from blacklisted
logged. The BLACKLIST_LOGLEVEL setting has no effect on entries in hosts are not logged. The setting determines the log level of
the BLACKLIST section of <ulink packets sent to the <emphasis role="bold">blacklog</emphasis> target
url="shorewall6-rules.html">shorewall6-rules</ulink> (5). It of <ulink
determines the log level of packets sent to the <emphasis
role="bold">blacklog</emphasis> target of <ulink
url="shorewall6-blrules.html">shorewall6-blrules</ulink>(5).</para> url="shorewall6-blrules.html">shorewall6-blrules</ulink>(5).</para>
</listitem> </listitem>
</varlistentry> </varlistentry>