really save options

diff --git a/src/PVE/API2/Firewall/Cluster.pm b/src/PVE/API2/Firewall/Cluster.pm
index d7146f39970ecee89c5958f73b7bc58255d84978..5923aa84bd219f33f220a7ba820d6b3b940b5785 100644 (file)
--- a/src/PVE/API2/Firewall/Cluster.pm
+++ b/src/PVE/API2/Firewall/Cluster.pm
@@ -105,6 +105,7 @@ __PACKAGE__->register_method({
     path => 'options',
     method => 'PUT',
     description => "Set Firewall options.",
+    protected => 1,
     parameters => {
        additionalProperties => 0,
        properties => &$add_option_properties({
@@ -133,7 +134,6 @@ __PACKAGE__->register_method({
            $cluster_conf->{options}->{enable} = $param->{enable} ? 1 : 0;
        }
 
-
        PVE::Firewall::save_clusterfw_conf($cluster_conf);
 
        return undef;

diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm
index 253bf6d5196abdac6f774b7b05bf8a583cf96d15..6707e669e3065c6539b120f928a170c7603d0c5f 100644 (file)
--- a/src/PVE/Firewall.pm
+++ b/src/PVE/Firewall.pm
@@ -1934,13 +1934,17 @@ my $format_rules = sub {
 };
 
 my $format_options = sub {
-    my ($raw, $options) = @_;
+    my ($options) = @_;
+
+    my $raw = '';
 
     $raw .= "[OPTIONS]\n\n";
     foreach my $opt (keys %$options) {
        $raw .= "$opt: $options->{$opt}\n";
     }
     $raw .= "\n";
+
+    return $raw;
 };
 
 sub save_vmfw_conf {
@@ -1949,7 +1953,7 @@ sub save_vmfw_conf {
     my $raw = '';
 
     my $options = $vmfw_conf->{options};
-    &$format_options($raw, $options) if scalar(keys %$options);
+    $raw .= &$format_options($options) if scalar(keys %$options);
     
     my $rules = $vmfw_conf->{rules};
     if (scalar(@$rules)) {
@@ -2123,7 +2127,7 @@ sub save_clusterfw_conf {
     my $raw = '';
 
     my $options = $cluster_conf->{options};
-    &$format_options($raw, $options) if scalar(keys %$options);
+    $raw .= &$format_options($options) if scalar(keys %$options);
 
     # fixme: save ipset
 
@@ -2159,7 +2163,7 @@ sub save_hostfw_conf {
     my $raw = '';
 
     my $options = $hostfw_conf->{options};
-    &$format_options($raw, $options) if scalar(keys %$options);
+    $raw .= &$format_options($options) if scalar(keys %$options);
     
     my $rules = $hostfw_conf->{rules};
     if (scalar(@$rules)) {