generate_ipset: skip undefined ipsets

I introduced that bug when I changed die to warn.

diff --git a/src/PVE/API2/Firewall/IPSet.pm b/src/PVE/API2/Firewall/IPSet.pm
index 45851d442dc7fed406b067938f0650854a0a2532..4dac1c4ea051e3f4efd3a4770ce901863b5f961c 100644 (file)
--- 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 8d25326a82b2f61914da94056711191fe7d49ab4..ac89966308cd3979ae5db90e778bde44d1d0ddaf 100644 (file)
--- 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) {