extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-20 01:37:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Correct tcrules update

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>

Conflicts:
	Shorewall/Perl/Shorewall/Tc.pm
This commit is contained in:
Tom Eastep 2015-08-13 13:21:51 -07:00
parent 2ab8bd3040
commit 4cc7a1b87d
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Shorewall/Perl/Shorewall/Tc.pm
View File

@ -3226,14 +3226,19 @@ sub setup_tc( $ ) {
} }
} }
close $mangle, directive_callback( 0 ) if $tcrules;
} elsif ( $tcrules ) {
close $mangle, directive_callback( 0 ); close $mangle, directive_callback( 0 );
} elsif ( -f ( my $fn = find_file( 'tcrules' ) ) ) {
if ( -f ( my $fn = find_file( 'tcrules' ) ) ) {
if ( unlink $fn ) { if ( unlink $fn ) {
warning_message "Empty tcrules file ($fn) removed"; warning_message "Empty tcrules file ($fn) removed";
} else { } else {
warning_message "Unable to remove empty tcrules file $fn: $!"; warning_message "Unable to remove empty tcrules file $fn: $!";
} }
} }
}
} elsif ( -f ( my $fn = find_file( 'tcrules' ) ) ) { } elsif ( -f ( my $fn = find_file( 'tcrules' ) ) ) {
warning_message "The tcrules file is no longer supported -- use the '$product update -t' to convert $fn to an equivalent 'mangle' file"; warning_message "The tcrules file is no longer supported -- use the '$product update -t' to convert $fn to an equivalent 'mangle' file";
} }