forked from extern/shorewall_code
Insist that '+' (if present) be the first non-blank character in IL matches
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
parent
cf330afbd9
commit
bef8ec09b3
@ -90,7 +90,7 @@ sub process_one_masq1( $$$$$$$$$$$ )
|
|||||||
#
|
#
|
||||||
# Handle early matches
|
# Handle early matches
|
||||||
#
|
#
|
||||||
if ( $inlinematches =~ s/s*\+// ) {
|
if ( $inlinematches =~ s/^s*\+// ) {
|
||||||
$prerule = $inlinematches;
|
$prerule = $inlinematches;
|
||||||
$inlinematches = '';
|
$inlinematches = '';
|
||||||
}
|
}
|
||||||
|
@ -73,7 +73,7 @@ sub process_conntrack_rule( $$$$$$$$$$ ) {
|
|||||||
my $raw_matches = get_inline_matches(0);
|
my $raw_matches = get_inline_matches(0);
|
||||||
my $prerule = '';
|
my $prerule = '';
|
||||||
|
|
||||||
if ( $raw_matches =~ /s*+/ ) {
|
if ( $raw_matches =~ /^s*+/ ) {
|
||||||
$prerule = $raw_matches;
|
$prerule = $raw_matches;
|
||||||
$raw_matches = '';
|
$raw_matches = '';
|
||||||
}
|
}
|
||||||
|
@ -2609,7 +2609,7 @@ sub process_rule ( $$$$$$$$$$$$$$$$$$$$ ) {
|
|||||||
#
|
#
|
||||||
# Handle early matches
|
# Handle early matches
|
||||||
#
|
#
|
||||||
if ( $raw_matches =~ s/s*\+// ) {
|
if ( $raw_matches =~ s/^s*\+// ) {
|
||||||
$prerule = $raw_matches;
|
$prerule = $raw_matches;
|
||||||
$raw_matches = '';
|
$raw_matches = '';
|
||||||
}
|
}
|
||||||
@ -4889,7 +4889,7 @@ sub process_mangle_rule1( $$$$$$$$$$$$$$$$$$$ ) {
|
|||||||
#
|
#
|
||||||
# Handle early matches
|
# Handle early matches
|
||||||
#
|
#
|
||||||
if ( $raw_matches =~ s/s*\+// ) {
|
if ( $raw_matches =~ s/^s*\+// ) {
|
||||||
$prerule = $raw_matches;
|
$prerule = $raw_matches;
|
||||||
$raw_matches = '';
|
$raw_matches = '';
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user