From ca5253a13e6422a0b0e063ecc0dded9fcc4de8aa Mon Sep 17 00:00:00 2001 From: teastep Date: Sun, 6 May 2007 23:43:21 +0000 Subject: [PATCH] Fix missing white space git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6261 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall-perl/Shorewall/Chains.pm | 8 ++++---- Shorewall-perl/Shorewall/Rules.pm | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Shorewall-perl/Shorewall/Chains.pm b/Shorewall-perl/Shorewall/Chains.pm index d52c27f20..680053111 100644 --- a/Shorewall-perl/Shorewall/Chains.pm +++ b/Shorewall-perl/Shorewall/Chains.pm @@ -1075,9 +1075,9 @@ sub match_ipsec_in( $$ ) { my $optionsref = $zoneref->{options}; if ( $zoneref->{type} eq 'ipsec4' ) { - $match .= "ipsec $optionsref->{in_out}{ipsec}$optionsref->{in}{ipsec}"; + $match .= "ipsec $optionsref->{in_out}{ipsec}$optionsref->{in}{ipsec} "; } elsif ( $capabilities{POLICY_MATCH} ) { - $match .= "$hostref->{ipsec} $optionsref->{in_out}{ipsec}$optionsref->{in}{ipsec}"; + $match .= "$hostref->{ipsec} $optionsref->{in_out}{ipsec}$optionsref->{in}{ipsec} "; } else { ''; } @@ -1093,9 +1093,9 @@ sub match_ipsec_out( $$ ) { my $optionsref = $zoneref->{options}; if ( $zoneref->{type} eq 'ipsec4' ) { - $match .= "ipsec $optionsref->{in_out}{ipsec}$optionsref->{out}{ipsec}"; + $match .= "ipsec $optionsref->{in_out}{ipsec}$optionsref->{out}{ipsec} "; } elsif ( $capabilities{POLICY_MATCH} ) { - $match .= "$hostref->{ipsec} $optionsref->{in_out}{ipsec}$optionsref->{out}{ipsec}" + $match .= "$hostref->{ipsec} $optionsref->{in_out}{ipsec}$optionsref->{out}{ipsec} " } else { ''; } diff --git a/Shorewall-perl/Shorewall/Rules.pm b/Shorewall-perl/Shorewall/Rules.pm index c90ca2157..2871b929d 100644 --- a/Shorewall-perl/Shorewall/Rules.pm +++ b/Shorewall-perl/Shorewall/Rules.pm @@ -1429,7 +1429,7 @@ sub generate_matrix() { for my $net ( @{$hostref->{hosts}} ) { add_rule $filter_table->{forward_chain $interface} , - match_source_net join( '', $net, $ipsec_match, "-j $frwd_ref->{name}" ); + join( '', match_source_net( $net ), $ipsec_match, "-j $frwd_ref->{name}" ); } } }