Merge pull request #587 from yast/L3_firewall_remote_fix

fix CWM firewall interfaces init
yast · Nov 15, 2017 · ea6ad70 · ea6ad70
2 parents c5e518a + 4992562
commit ea6ad70
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/package/yast2-network.changes b/package/yast2-network.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Nov 14 17:05:47 UTC 2017 - jreidinger@suse.com
+
+- bnc#1066982
+  - fixed initialization and storing of firewall widget
+- 3.1.183
+
 -------------------------------------------------------------------
 Tue Aug  1 07:48:25 UTC 2017 - mfilka@suse.com
 

diff --git a/package/yast2-network.spec b/package/yast2-network.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-network
-Version:        3.1.182
+Version:        3.1.183
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/include/network/remote/dialogs.rb b/src/include/network/remote/dialogs.rb
@@ -37,6 +37,7 @@ def initialize_network_remote_dialogs(_include_target)
       Yast.import "Remote"
       Yast.import "Wizard"
       Yast.import "CWMFirewallInterfaces"
+      Yast.import "SuSEFirewall"
       Yast.import "Popup"
     end
 
@@ -86,6 +87,9 @@ def RemoteMainDialog
         )
       )
 
+      # read firewall configuration before we init widget.
+      # See CWMFirewallInterfaces top level documentation.
+      SuSEFirewall.Read
       firewall_widget = CWMFirewallInterfaces.CreateOpenFirewallWidget(
         "services" => ["service:vnc-httpd", "service:vnc-server"], "display_details" => true
       )
@@ -155,6 +159,8 @@ def RemoteMainDialog
       end
       if ret == :next
         CWMFirewallInterfaces.OpenFirewallStore(firewall_widget, "", event)
+        # OpenFirewallStore just sets variables, but we need real firewall write
+        SuSEFirewall.Write
 
         allow_with_vncmanager = UI.QueryWidget(Id(:allow_with_vncmanager), :Value)
         allow_without_vncmanager = UI.QueryWidget(Id(:allow_without_vncmanager), :Value)