extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-14 13:47:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Apply nfw's fix for IP[6]TABLES in the conntrack file

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2015-03-24 09:23:15 -07:00
parent 6921270c77
commit 468167f9e5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Shorewall/Perl/Shorewall/Raw.pm
View File

@ -113,7 +113,7 @@ sub process_conntrack_rule( $$$$$$$$$$ ) {
$action = $1; $action = $1;
$disposition = $1; $disposition = $1;
} }
} elsif ( $action =~ /^IP(6)?TABLES\((.+)\)(:(.*))$/ ) { } elsif ( $action =~ /^IP(6)?TABLES\((.+)\)(:(.*))?$/ ) {
if ( $family == F_IPV4 ) { if ( $family == F_IPV4 ) {
fatal_error 'Invalid conntrack ACTION (IP6TABLES)' if $1; fatal_error 'Invalid conntrack ACTION (IP6TABLES)' if $1;
} else { } else {
@ -125,8 +125,8 @@ sub process_conntrack_rule( $$$$$$$$$$ ) {
fatal_error "Unknown target ($tgt)" unless $target_type; fatal_error "Unknown target ($tgt)" unless $target_type;
fatal_error "The $tgt TARGET is not allowed in the raw table" unless $target_type & RAW_TABLE; fatal_error "The $tgt TARGET is not allowed in the raw table" unless $target_type & RAW_TABLE;
$disposition = $tgt; $disposition = $tgt;
$action = 2; $action = $2;
validate_level( $level = $3 ) if supplied $3; validate_level( $level = $4 ) if supplied $4;
} else { } else {
( $disposition, my ( $option, $args ), $level ) = split ':', $action, 4; ( $disposition, my ( $option, $args ), $level ) = split ':', $action, 4;