extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-02-18 10:40:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make replacement of '+' by '*' global in case statements.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2011-11-04 13:48:13 -07:00
parent aed595f1d8
commit 689e9b0fe1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -174,7 +174,7 @@ sub copy_and_edit_table( $$$$ ) {
# #
# Shell and iptables use a different wildcard character # Shell and iptables use a different wildcard character
# #
$copy =~ s/\+/*/; $copy =~ s/\+/*/g;
emit ''; emit '';

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

@ -1623,7 +1623,7 @@ sub compile_updown() {
if ( @$ignore ) { if ( @$ignore ) {
my $interfaces = join '|', map $interfaces{$_}->{physical}, @$ignore; my $interfaces = join '|', map $interfaces{$_}->{physical}, @$ignore;
$interfaces =~ s/\+/*/; $interfaces =~ s/\+/*/g;
emit( "$interfaces)", emit( "$interfaces)",
' progress_message3 "$COMMAND on interface $1 ignored"', ' progress_message3 "$COMMAND on interface $1 ignored"',
@ -1635,7 +1635,7 @@ sub compile_updown() {
if ( @$required ) { if ( @$required ) {
my $interfaces = join '|', map $interfaces{$_}->{physical}, @$required; my $interfaces = join '|', map $interfaces{$_}->{physical}, @$required;
my $wildcard = ( $interfaces =~ s/\+/*/ ); my $wildcard = ( $interfaces =~ s/\+/*/g );
emit( "$interfaces)", emit( "$interfaces)",
' if [ "$COMMAND" = up ]; then' ); ' if [ "$COMMAND" = up ]; then' );
@ -1677,7 +1677,7 @@ sub compile_updown() {
my @interfaces = map $interfaces{$_}->{physical}, @$optional; my @interfaces = map $interfaces{$_}->{physical}, @$optional;
my $interfaces = join '|', @interfaces; my $interfaces = join '|', @interfaces;
if ( $interfaces =~ s/\+/*/ || @interfaces > 1 ) { if ( $interfaces =~ s/\+/*/g || @interfaces > 1 ) {
emit( "$interfaces)", emit( "$interfaces)",
' if [ "$COMMAND" = up ]; then', ' if [ "$COMMAND" = up ]; then',
' echo 0 > ${VARDIR}/${1}.state', ' echo 0 > ${VARDIR}/${1}.state',