Correct handling of <interface>:+<ipset> in Shorewall6.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2011-07-08 15:55:58 -07:00
parent 218fd75119
commit 0e81d6c90c

View File

@ -3924,7 +3924,7 @@ sub expand_rule( $$$$$$$$$$;$ )
} else {
$iiface = $source;
}
} elsif ( $source =~ /^(.+?):<(.+)>\s*$/ || $source =~ /^(.+?):\[(.+)\]\s*$/ ) {
} elsif ( $source =~ /^(.+?):<(.+)>\s*$/ || $source =~ /^(.+?):\[(.+)\]\s*$/ || $source =~ /^(.+?):(\+.+)$/ ) {
$iiface = $1;
$inets = $2;
} elsif ( $source =~ /:/ ) {
@ -4023,7 +4023,7 @@ sub expand_rule( $$$$$$$$$$;$ )
} else {
$diface = $dest;
}
} elsif ( $dest =~ /^(.+?):<(.+)>\s*$/ || $dest =~ /^(.+?):\[(.+)\]\s*$/) {
} elsif ( $dest =~ /^(.+?):<(.+)>\s*$/ || $dest =~ /^(.+?):\[(.+)\]\s*$/ || $dest =~ /^(.+?):(\+.+)$/ ) {
$diface = $1;
$dnets = $2;
} elsif ( $dest =~ /:/ ) {