From 55cf06d0a82e5e0fb8d8650210cb22741780d29a Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Wed, 15 Mar 2017 10:09:53 -0700 Subject: [PATCH] Correct all+ handling in the policy file Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Rules.pm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Rules.pm b/Shorewall/Perl/Shorewall/Rules.pm index 9010c5ddf..ee86dc078 100644 --- a/Shorewall/Perl/Shorewall/Rules.pm +++ b/Shorewall/Perl/Shorewall/Rules.pm @@ -747,22 +747,21 @@ sub process_a_policy1($$$$$$$) { if ( $serverwild ) { for my $zone ( @zonelist ) { for my $zone1 ( @zonelist ) { - set_policy_chain rules_chain( ${zone}, ${zone1} ), $client, $server, $chainref, $policy, $intrazone; + set_policy_chain rules_chain( ${zone}, ${zone1} ), $zone, $zone1, $chainref, $policy, $intrazone; print_policy $zone, $zone1, $originalpolicy, $chain; } } } else { for my $zone ( all_zones ) { - set_policy_chain rules_chain( ${zone}, ${server} ), $client, $server, $chainref, $policy, $intrazone; + set_policy_chain rules_chain( ${zone}, ${server} ), $zone, $server, $chainref, $policy, $intrazone; print_policy $zone, $server, $originalpolicy, $chain; } } } elsif ( $serverwild ) { for my $zone ( @zonelist ) { - set_policy_chain rules_chain( ${client}, ${zone} ), $client, $server, $chainref, $policy, $intrazone; + set_policy_chain rules_chain( ${client}, ${zone} ), $client, $zone, $chainref, $policy, $intrazone; print_policy $client, $zone, $originalpolicy, $chain; } - } else { print_policy $client, $server, $originalpolicy, $chain; }