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

Some more fixes to conditional inclusion.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-04-07 07:16:17 -07:00
parent 97cc4930cf
commit 7204220991
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1548,6 +1548,8 @@ sub close_file() {
# #
# Process an ?IF, ?ELSE or ?END directive # Process an ?IF, ?ELSE or ?END directive
# #
sub have_capability( $ );
sub process_conditional( $$$ ) { sub process_conditional( $$$ ) {
my ( $omitting, $line, $linenumber ) = @_; my ( $omitting, $line, $linenumber ) = @_;
@ -1582,7 +1584,7 @@ sub process_conditional( $$$ ) {
$omitting = ! ( exists $ENV{$rest} ? $ENV{$rest} : $omitting = ! ( exists $ENV{$rest} ? $ENV{$rest} :
exists $params{$rest} ? $params{$rest} : exists $params{$rest} ? $params{$rest} :
exists $config{$rest} ? $config{$rest} : exists $config{$rest} ? $config{$rest} :
exists $capdesc{$cap} ? have_capability $cap : 0 ); exists $capdesc{$cap} ? have_capability( $cap ) : 0 );
} }
$omitting = ! $omitting if $invert; $omitting = ! $omitting if $invert;
@ -1958,7 +1960,7 @@ sub embedded_shell( $ ) {
} }
fatal_error ( "Missing END SHELL" ) unless $last; fatal_error ( "Missing END SHELL" ) unless $last;
fatal_error ( "Invalid END SHELL directive" ) unless /^\s*$/; fatal_error ( "Invalid END SHELL directive" ) unless $currentline =~ /^\s*$/;
} }
$command .= q('); $command .= q(');
@ -1994,7 +1996,7 @@ sub embedded_perl( $ ) {
} }
fatal_error ( "Missing END PERL" ) unless $last; fatal_error ( "Missing END PERL" ) unless $last;
fatal_error ( "Invalid END PERL directive" ) unless /^\s*$/; fatal_error ( "Invalid END PERL directive" ) unless $currentline =~ /^\s*$/;
} }
unless (my $return = eval $command ) { unless (my $return = eval $command ) {
@ -2626,8 +2628,6 @@ sub determine_kernelversion() {
# #
# Capability Reporting and detection. # Capability Reporting and detection.
# #
sub have_capability( $ );
sub Nat_Enabled() { sub Nat_Enabled() {
$family == F_IPV4 ? qt1( "$iptables -t nat -L -n" ) : ''; $family == F_IPV4 ? qt1( "$iptables -t nat -L -n" ) : '';
} }