always pass cluster_conf to load_vmfw_conf

[pve-firewall.git] / src / PVE / API2 / Firewall / VM.pm

diff --git a/src/PVE/API2/Firewall/VM.pm b/src/PVE/API2/Firewall/VM.pm
index 040f23edfa679accd8e002d96d1a55aabb0aa5b1..732f6bf84cffb223e159f25f2a38e70ff8b3144a 100644 (file)
--- a/src/PVE/API2/Firewall/VM.pm
+++ b/src/PVE/API2/Firewall/VM.pm
@@ -115,7 +115,8 @@ sub register_handlers {
        code => sub {
            my ($param) = @_;
 
        code => sub {
            my ($param) = @_;
 

-           my $vmfw_conf = PVE::Firewall::load_vmfw_conf($rule_env, $param->{vmid});
+           my $cluster_conf = PVE::Firewall::load_clusterfw_conf();
+           my $vmfw_conf = PVE::Firewall::load_vmfw_conf($cluster_conf, $rule_env, $param->{vmid});

 
            return PVE::Firewall::copy_opject_with_digest($vmfw_conf->{options});
        }});
 
            return PVE::Firewall::copy_opject_with_digest($vmfw_conf->{options});
        }});


@@ -144,7 +145,9 @@ sub register_handlers {
        code => sub {
            my ($param) = @_;
 
        code => sub {
            my ($param) = @_;
 

-           my $vmfw_conf = PVE::Firewall::load_vmfw_conf($rule_env, $param->{vmid});
+
+           my $cluster_conf = PVE::Firewall::load_clusterfw_conf();
+           my $vmfw_conf = PVE::Firewall::load_vmfw_conf($cluster_conf, $rule_env, $param->{vmid});

 
            my (undef, $digest) = PVE::Firewall::copy_opject_with_digest($vmfw_conf->{options});
            PVE::Tools::assert_if_modified($digest, $param->{digest});
 
            my (undef, $digest) = PVE::Firewall::copy_opject_with_digest($vmfw_conf->{options});
            PVE::Tools::assert_if_modified($digest, $param->{digest});