From 689e9b0fe14f23110d1bd2af06bb9416913a5a70 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Fri, 4 Nov 2011 13:48:13 -0700 Subject: [PATCH] Make replacement of '+' by '*' global in case statements. Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Providers.pm | 2 +- Shorewall/Perl/Shorewall/Zones.pm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Providers.pm b/Shorewall/Perl/Shorewall/Providers.pm index 9fb4d6d7c..a6f5bc4a9 100644 --- a/Shorewall/Perl/Shorewall/Providers.pm +++ b/Shorewall/Perl/Shorewall/Providers.pm @@ -174,7 +174,7 @@ sub copy_and_edit_table( $$$$ ) { # # Shell and iptables use a different wildcard character # - $copy =~ s/\+/*/; + $copy =~ s/\+/*/g; emit ''; diff --git a/Shorewall/Perl/Shorewall/Zones.pm b/Shorewall/Perl/Shorewall/Zones.pm index e2556cdb6..b7be6e4d7 100644 --- a/Shorewall/Perl/Shorewall/Zones.pm +++ b/Shorewall/Perl/Shorewall/Zones.pm @@ -1623,7 +1623,7 @@ sub compile_updown() { if ( @$ignore ) { my $interfaces = join '|', map $interfaces{$_}->{physical}, @$ignore; - $interfaces =~ s/\+/*/; + $interfaces =~ s/\+/*/g; emit( "$interfaces)", ' progress_message3 "$COMMAND on interface $1 ignored"', @@ -1635,7 +1635,7 @@ sub compile_updown() { if ( @$required ) { my $interfaces = join '|', map $interfaces{$_}->{physical}, @$required; - my $wildcard = ( $interfaces =~ s/\+/*/ ); + my $wildcard = ( $interfaces =~ s/\+/*/g ); emit( "$interfaces)", ' if [ "$COMMAND" = up ]; then' ); @@ -1677,7 +1677,7 @@ sub compile_updown() { my @interfaces = map $interfaces{$_}->{physical}, @$optional; my $interfaces = join '|', @interfaces; - if ( $interfaces =~ s/\+/*/ || @interfaces > 1 ) { + if ( $interfaces =~ s/\+/*/g || @interfaces > 1 ) { emit( "$interfaces)", ' if [ "$COMMAND" = up ]; then', ' echo 0 > ${VARDIR}/${1}.state',