extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-15 10:51:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve error message

Browse Source
This commit is contained in:
Tom Eastep 2009-11-29 09:55:32 -08:00
parent 8c033de049
commit 4494272dcd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Shorewall/Perl/Shorewall/Rules.pm
View File

@ -949,7 +949,7 @@ sub process_macro ( $$$$$$$$$$$$$$$ ) {
} }
# #
# Once a rule has been expanded via wildcards (source and/or dest zone == 'all'), it is processed by this function. If # Once a rule has been expanded via wildcards (source and/or dest zone eq 'all'), it is processed by this function. If
# the target is a macro, the macro is expanded and this function is called recursively for each rule in the expansion. # the target is a macro, the macro is expanded and this function is called recursively for each rule in the expansion.
# #
sub process_rule1 ( $$$$$$$$$$$$$ ) { sub process_rule1 ( $$$$$$$$$$$$$ ) {
@ -972,7 +972,7 @@ sub process_rule1 ( $$$$$$$$$$$$$ ) {
my $actiontype = $targets{$basictarget} || find_macro( $basictarget ); my $actiontype = $targets{$basictarget} || find_macro( $basictarget );
if ( $config{ MAPOLDACTIONS } ) { if ( $config{ MAPOLDACTIONS } ) {
( $basictarget, $actiontype , $param ) = map_old_actions( $basictarget ) unless ( $actiontype || $param ); ( $basictarget, $actiontype , $param ) = map_old_actions( $basictarget ) unless $actiontype || $param;
} }
fatal_error "Unknown action ($action)" unless $actiontype; fatal_error "Unknown action ($action)" unless $actiontype;
@ -1092,7 +1092,7 @@ sub process_rule1 ( $$$$$$$$$$$$$ ) {
$destref = defined_zone( $destzone ); $destref = defined_zone( $destzone );
if ( $destref ) { if ( $destref ) {
warning_message "Destination zone ($destzone) ignored"; warning_message "The destination zone ($destzone) is ignored in $log_action rules";
} else { } else {
$dest = join ':', $destzone, $dest; $dest = join ':', $destzone, $dest;
$destzone = ''; $destzone = '';