From 7dd132596c318b4cce431494adec86b5a3110e16 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Tue, 22 Apr 2014 12:43:54 +0200 Subject: [PATCH] generate_ipset: skip undefined ipsets I introduced that bug when I changed die to warn. --- src/PVE/API2/Firewall/IPSet.pm | 1 - src/PVE/Firewall.pm | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/PVE/API2/Firewall/IPSet.pm b/src/PVE/API2/Firewall/IPSet.pm index 45851d4..4dac1c4 100644 --- a/src/PVE/API2/Firewall/IPSet.pm +++ b/src/PVE/API2/Firewall/IPSet.pm @@ -209,7 +209,6 @@ sub register_update_ip { my (undef, $digest) = PVE::Firewall::copy_list_with_digest($ipset); PVE::Tools::assert_if_modified($digest, $param->{digest}); - warn "TEST:$digest:$param->{digest}:\n"; foreach my $entry (@$ipset) { if($entry->{cidr} eq $param->{cidr}) { diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm index 8d25326..ac89966 100644 --- a/src/PVE/Firewall.pm +++ b/src/PVE/Firewall.pm @@ -2462,11 +2462,13 @@ sub generate_ipset { my $alias = lc($cidr); if ($aliases->{$alias}) { $entry->{cidr} = $aliases->{$alias}->{cidr}; + $nethash->{$entry->{cidr}} = $entry; } else { warn "no such alias '$cidr'\n" if !$aliases->{$alias}; } + } else { + $nethash->{$entry->{cidr}} = $entry; } - $nethash->{$entry->{cidr}} = $entry; } foreach my $cidr (sort keys %$nethash) { -- 2.39.2