holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Use the correct filename in ?IF/?ELSIF exec call.

Browse Source 
- Also extend a comment in the TC module

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-07-02 11:53:01 -07:00
parent 74f831a73e
commit a5b637b2a7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall/Perl/Shorewall/Config.pm
View File

@ -1714,7 +1714,7 @@ sub evaluate_expression( $$$ ) {
$expression = join( '', $first, $val, $rest ); $expression = join( '', $first, $val, $rest );
} }
my $val = eval qq(package Shorewall::User;\nuse strict;\n# line $linenumber "$currentfilename"\n$expression); my $val = eval qq(package Shorewall::User;\nuse strict;\n# line $linenumber "$filename"\n$expression);
unless ( $val ) { unless ( $val ) {
cond_error( "Couldn't parse expression: $@" , $filename, $linenumber ) if $@; cond_error( "Couldn't parse expression: $@" , $filename, $linenumber ) if $@;

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

@ -2009,7 +2009,7 @@ sub process_traffic_shaping() {
} }
# #
# Validate the TC configuration storing basic information in %tcdevices and %tcdevices # Validate the TC configuration storing basic information in %tcdevices and %tcclasses (complex TC only)
# #
sub process_tc() { sub process_tc() {
if ( $config{TC_ENABLED} eq 'Internal' || $config{TC_ENABLED} eq 'Shared' ) { if ( $config{TC_ENABLED} eq 'Internal' || $config{TC_ENABLED} eq 'Shared' ) {