From 68c90e210e53b10f63b47da62c06507afc68ef6e Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Wed, 2 Apr 2014 12:51:30 +0200
Subject: [PATCH] really save options

---
 src/PVE/API2/Firewall/Cluster.pm |  2 +-
 src/PVE/Firewall.pm              | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/PVE/API2/Firewall/Cluster.pm b/src/PVE/API2/Firewall/Cluster.pm
index d7146f3..5923aa8 100644
--- 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 253bf6d..6707e66 100644
--- 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)) {
-- 
2.39.2