Tweaks to the Tc.pm module.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2013-12-31 11:42:38 -08:00
parent ac6a506e35
commit 4c1b83beef

View File

@ -474,7 +474,6 @@ sub process_mangle_rule1( $$$$$$$$$$$$$$$$$ ) {
my $target_type = $builtin_target{$tgt}; my $target_type = $builtin_target{$tgt};
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 mangle table" unless $target_type & MANGLE_TABLE; fatal_error "The $tgt TARGET is not allowed in the mangle table" unless $target_type & MANGLE_TABLE;
fatal_error "The $tgt TARGET is not allowed in the mangle table" unless
$target = $params; $target = $params;
}, },
}, },
@ -2806,9 +2805,9 @@ sub setup_tc() {
if ( -f find_file 'mangle' ) { if ( -f find_file 'mangle' ) {
if ( $have_tcrules ) { if ( $have_tcrules ) {
warning_message "The 'tcrules' file is non-empty -- 'mangle' file ignored"; warning_message "Non-empty tcrules file ($fn); please move its contents to the mangle file";
} elsif ( my $fn = open_file( 'mangle', 2, 1 ) ) { } elsif ( my $fn = open_file( 'mangle', 2, 1 ) ) {
first_entry "$doing $fn..."; first_entry "$doing $fn...";
process_mangle_rule while read_a_line( NORMAL_READ ); process_mangle_rule while read_a_line( NORMAL_READ );