Merge branch '4.5.7'

This commit is contained in:
Tom Eastep 2012-08-26 09:18:16 -07:00
commit 7b12558249

View File

@ -79,7 +79,7 @@ sub process_conntrack_rule( $$$$$$$$$ ) {
# A patch that deimplements the NOTRACK target has been posted on the # A patch that deimplements the NOTRACK target has been posted on the
# Netfilter development list # Netfilter development list
# #
$action = 'CT--notrack' if have_capability 'CT_TARGET'; $action = 'CT --notrack' if have_capability 'CT_TARGET';
} else { } else {
( $target, my ( $option, $args, $junk ) ) = split ':', $action, 4; ( $target, my ( $option, $args, $junk ) ) = split ':', $action, 4;