Fix handling of CT_TARGET

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2013-05-01 11:15:36 -07:00
parent 82bfb5ac50
commit 54f5aaca63

View File

@ -1185,14 +1185,24 @@ sub cleanup() {
qt1( "$iptables -X $sillyname" ); qt1( "$iptables -X $sillyname" );
qt1( "$iptables -F $sillyname1" ); qt1( "$iptables -F $sillyname1" );
qt1( "$iptables -X $sillyname1" ); qt1( "$iptables -X $sillyname1" );
qt1( "$iptables -t mangle -F $sillyname" );
qt1( "$iptables -t mangle -X $sillyname" ); if ( $capabilities{MANGLE_ENABLED} ) {
qt1( "$iptables -t nat -F $sillyname" ); qt1( "$iptables -t mangle -F $sillyname" );
qt1( "$iptables -t nat -X $sillyname" ); qt1( "$iptables -t mangle -X $sillyname" );
qt1( "$iptables -t raw -F $sillyname" ); }
qt1( "$iptables -t raw -X $sillyname" );
qt1( "$iptables -t rawpost -F $sillyname" ); if ( $capabilities{NAT_ENABLED} ) {
qt1( "$iptables -t rawpost -X $sillyname" ); qt1( "$iptables -t nat -F $sillyname" );
qt1( "$iptables -t nat -X $sillyname" );
}
if ( $capabilities{RAW_TABLE} ) {
qt1( "$iptables -t raw -F $sillyname" );
qt1( "$iptables -t raw -X $sillyname" );
}
$sillyname = $sillyname1 = undef;
$sillyname = ''; $sillyname = '';
} }
} }
@ -4335,27 +4345,6 @@ sub determine_capabilities() {
$capabilities{HELPER_MATCH} = detect_capability 'HELPER_MATCH'; $capabilities{HELPER_MATCH} = detect_capability 'HELPER_MATCH';
} }
qt1( "$iptables -F $sillyname" );
qt1( "$iptables -X $sillyname" );
qt1( "$iptables -F $sillyname1" );
qt1( "$iptables -X $sillyname1" );
if ( $capabilities{MANGLE_ENABLED} ) {
qt1( "$iptables -t mangle -F $sillyname" );
qt1( "$iptables -t mangle -X $sillyname" );
}
if ( $capabilities{NAT_ENABLED} ) {
qt1( "$iptables -t nat -F $sillyname" );
qt1( "$iptables -t nat -X $sillyname" );
}
if ( $capabilities{RAW_TABLE} ) {
qt1( "$iptables -t raw -F $sillyname" );
qt1( "$iptables -t raw -X $sillyname" );
}
$sillyname = $sillyname1 = undef;
} }
} }