mirror of
https://gitlab.com/shorewall/code.git
synced 2024-11-15 12:14:32 +01:00
Remove some WARNINGs
- Mr Dash4 has decided he doesn't want them after all.
This commit is contained in:
parent
e47ae4f26e
commit
5bfd2cc2c9
@ -488,8 +488,6 @@ my %builtin_target = ( ACCEPT => 1,
|
||||
ULOG => 1,
|
||||
);
|
||||
|
||||
my %ipset_exists;
|
||||
|
||||
#
|
||||
# Rules are stored in an internal form
|
||||
#
|
||||
@ -619,8 +617,6 @@ sub initialize( $$$ ) {
|
||||
$hashlimitset = 0;
|
||||
$ipset_rules = 0 if $hard;
|
||||
|
||||
%ipset_exists = ();
|
||||
|
||||
%helpers = ( amanda => TCP,
|
||||
ftp => TCP,
|
||||
h323 => UDP,
|
||||
@ -4483,20 +4479,10 @@ sub get_set_flags( $$ ) {
|
||||
my @options = split /,/, $options;
|
||||
my %typemap = ( src => 'Source', dst => 'Destination' );
|
||||
|
||||
for ( @options ) {
|
||||
warning_message( "The '$_' ipset flag is used in a $typemap{$option} column" ), last unless $_ eq $option;
|
||||
}
|
||||
}
|
||||
|
||||
$setname =~ s/^\+//;
|
||||
|
||||
unless ( $export || $> != 0 ) {
|
||||
unless ( $ipset_exists{$setname} ) {
|
||||
warning_message "Ipset $setname does not exist" unless qt "ipset -L $setname";
|
||||
}
|
||||
|
||||
$ipset_exists{$setname} = 1; # Suppress subsequent checks/warnings
|
||||
}
|
||||
fatal_error "Invalid ipset name ($setname)" unless $setname =~ /^(6_)?[a-zA-Z]\w*/;
|
||||
|
||||
have_capability 'OLD_IPSET_MATCH' ? "--set $setname $options " : "--match-set $setname $options ";
|
||||
|
Loading…
Reference in New Issue
Block a user