Fix problem with TC_ENABLED=No

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6948 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-07-24 16:54:13 +00:00
parent 2bef2d631e
commit 31a01cdcc4
3 changed files with 9 additions and 2 deletions

View File

@ -48,6 +48,13 @@ Problems corrected in 4.0.1.
'ipsec4' and the 'ipsec' option removed from the hosts file entry, 'ipsec4' and the 'ipsec' option removed from the hosts file entry,
the configuration worked properly. the configuration worked properly.
5) If a CLASSID was specified in a tcrule and TC_ENABLED=No, then
Shorewall-perl produced the following:
Compiling...
Use of uninitialized value in string ne at /usr/share/shorewall-perl/Shorewall/Tc.pm line 285, <$currentfile> line 18.
ERROR: Class Id 1:110 is not associated with device eth0 : /etc/shorewall/tcrules (line 18)
Other changes in Shorewall 4.0.1. Other changes in Shorewall 4.0.1.
1) A new EXPAND_POLICIES option is added to shorewall.conf. The 1) A new EXPAND_POLICIES option is added to shorewall.conf. The

View File

@ -171,7 +171,7 @@ our $filter_table;
# #
# It is a layer violation to keep information about the rules file sections in this module but in Shorewall, the rules file # It is a layer violation to keep information about the rules file sections in this module but in Shorewall, the rules file
# and the filter table are very closely tied. By keeping the information here, we avoid making several other modules dependent # and the filter table are very closely tied. By keeping the information here, we avoid making several other modules dependent
# in Shorewall::Rules. # on Shorewall::Rules.
# #
our %sections; our %sections;
our $section; our $section;

View File

@ -282,7 +282,7 @@ sub process_tc_rule( $$$$$$$$$$ ) {
# #
# expand_rule() returns destination device if any # expand_rule() returns destination device if any
# #
fatal_error "Class Id $original_mark is not associated with device $result" if $classid && $device ne $result; fatal_error "Class Id $original_mark is not associated with device $result" if $config{TC_ENABLED} eq 'internal' && $classid && $device ne $result;
} }
progress_message " TC Rule \"$currentline\" $done"; progress_message " TC Rule \"$currentline\" $done";