From 92b25d88b0d75537b5b201117d2f0815565de540 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Tue, 7 Apr 2020 11:08:46 -0700 Subject: [PATCH] Revert "Add conditional sorts to find[_zone]_hosts_by_option()" This reverts commit 42a505c99d94cd793da5058ace7feab0cbf2e39b. --- Shorewall/Perl/Shorewall/Zones.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Zones.pm b/Shorewall/Perl/Shorewall/Zones.pm index 29e870606..1fc4f515f 100644 --- a/Shorewall/Perl/Shorewall/Zones.pm +++ b/Shorewall/Perl/Shorewall/Zones.pm @@ -2321,9 +2321,9 @@ sub find_hosts_by_option( $ ) { } for my $zone ( grep ! ( $zones{$_}{type} & FIREWALL ) , @zones ) { - for my $type (sortkeysiftest %{$zones{$zone}{hosts}} ) { + for my $type (keys %{$zones{$zone}{hosts}} ) { my $interfaceref = $zones{$zone}{hosts}->{$type}; - for my $interface ( sortkeysiftest %$interfaceref ) { + for my $interface ( keys %$interfaceref ) { my $arrayref = $interfaceref->{$interface}; for my $host ( @{$arrayref} ) { my $ipsec = $host->{ipsec}; @@ -2351,9 +2351,9 @@ sub find_zone_hosts_by_option( $$ ) { my @hosts; unless ( $zones{$zone}{type} & FIREWALL ) { - for my $type (sortkeysiftest %{$zones{$zone}{hosts}} ) { + for my $type (keys %{$zones{$zone}{hosts}} ) { my $interfaceref = $zones{$zone}{hosts}->{$type}; - for my $interface ( sortkeysiftest %$interfaceref ) { + for my $interface ( keys %$interfaceref ) { my $arrayref = $interfaceref->{$interface}; for my $host ( @{$arrayref} ) { if ( my $value = $host->{options}{$option} ) {