generate_ipset: skip undefined ipsets

[pve-firewall.git] / src / pvefw

diff --git a/src/pvefw b/src/pvefw
index 6dd1aafdb1eb9d8e595610f70e4057f1db610428..754a4eafd791a669df60859ce4e983e2a9160a87 100755 (executable)
--- a/src/pvefw
+++ b/src/pvefw
@@ -60,10 +60,10 @@ __PACKAGE__->register_method ({
            if !defined($param->{verbose}) && ($rpcenv->{type} eq 'cli');
 
        my $code = sub {
-           my ($ruleset, $hostfw_conf, $ipset_ruleset) = PVE::Firewall::compile();
+           my ($ruleset, $ipset_ruleset) = PVE::Firewall::compile();
 
            if ($param->{verbose}) {
-               my (undef, $ipset_changes) = PVE::Firewall::get_ipset_cmdlist($ipset_ruleset, 1);
+               my (undef, undef, $ipset_changes) = PVE::Firewall::get_ipset_cmdlist($ipset_ruleset, 1);
                my (undef, $ruleset_changes) = PVE::Firewall::get_ruleset_cmdlist($ruleset, 1);
                if ($ipset_changes || $ruleset_changes) {
                    print "detected changes\n";
@@ -115,9 +115,9 @@ __PACKAGE__->register_method ({
 
            my $res = { status => $status };
            if ($status eq 'active') {
-               my ($ruleset, $hostfw_conf, $ipset_ruleset) = PVE::Firewall::compile();
+               my ($ruleset, $ipset_ruleset) = PVE::Firewall::compile();
 
-               my (undef, $ipset_changes) = PVE::Firewall::get_ipset_cmdlist($ipset_ruleset);
+               my (undef, undef, $ipset_changes) = PVE::Firewall::get_ipset_cmdlist($ipset_ruleset);
                my (undef, $ruleset_changes) = PVE::Firewall::get_ruleset_cmdlist($ruleset);
                # fixme: ipset changes
                $res->{changes} = ($ipset_changes || $ruleset_changes) ? 1 : 0;