mirror of
https://gitlab.com/shorewall/code.git
synced 2024-12-19 04:41:07 +01:00
Merge branch '4.4.20'
This commit is contained in:
commit
653a61a04a
@ -203,7 +203,7 @@ sub setup_blacklist() {
|
|||||||
my $chainref;
|
my $chainref;
|
||||||
my $chainref1;
|
my $chainref1;
|
||||||
my ( $level, $disposition ) = @config{'BLACKLIST_LOGLEVEL', 'BLACKLIST_DISPOSITION' };
|
my ( $level, $disposition ) = @config{'BLACKLIST_LOGLEVEL', 'BLACKLIST_DISPOSITION' };
|
||||||
my $audit = $disposition =~ /^A_/;
|
my $audit = $disposition =~ s/^A_//;
|
||||||
my $target = $disposition eq 'REJECT' ? 'reject' : $disposition;
|
my $target = $disposition eq 'REJECT' ? 'reject' : $disposition;
|
||||||
my $orig_target = $target;
|
my $orig_target = $target;
|
||||||
|
|
||||||
@ -233,7 +233,7 @@ sub setup_blacklist() {
|
|||||||
$target = 'blacklog';
|
$target = 'blacklog';
|
||||||
} elsif ( $audit ) {
|
} elsif ( $audit ) {
|
||||||
require_capability 'AUDIT_TARGET', "BLACKLIST_DISPOSITION=$disposition", 's';
|
require_capability 'AUDIT_TARGET', "BLACKLIST_DISPOSITION=$disposition", 's';
|
||||||
$target = verify_audit( $disposition );
|
$target = verify_audit( $config{BLACKLIST_DISPOSITION} );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user