mirror of
https://gitlab.com/shorewall/code.git
synced 2025-02-20 11:42:26 +01:00
Merge branch '4.5.1'
This commit is contained in:
commit
2a67a202b0
@ -4239,10 +4239,10 @@ sub do_length( $ ) {
|
||||
|
||||
require_capability( 'LENGTH_MATCH' , 'A Non-empty LENGTH' , 's' );
|
||||
|
||||
fatal_error "Invalid LENGTH ($length)" unless $length =~/^(\d+)(:(\d+))$/;
|
||||
fatal_error "Invalid LENGTH ($length)" unless $length =~/^(\d+)(:(\d+))?$/;
|
||||
|
||||
if ( supplied $3 ) {
|
||||
fatal_error "First length must be < second length" unless $1 < $2;
|
||||
if ( supplied $2 ) {
|
||||
fatal_error "First length must be < second length" unless $1 < $3;
|
||||
}
|
||||
|
||||
"-m length --length $length ";
|
||||
@ -4484,7 +4484,7 @@ sub get_set_flags( $$ ) {
|
||||
my %typemap = ( src => 'Source', dst => 'Destination' );
|
||||
|
||||
for ( @options ) {
|
||||
warning_messsage( "The '$_' ipset flag is used in a $typemap{$option} column" ), last unless $_ eq $option;
|
||||
warning_message( "The '$_' ipset flag is used in a $typemap{$option} column" ), last unless $_ eq $option;
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user