Merge 2c22c9e into ae7d17f

yast · Feb 14, 2018 · 156f56b · 156f56b
2 parents ae7d17f + 2c22c9e
commit 156f56b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/package/yast2-firewall.changes b/package/yast2-firewall.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 14 17:23:32 UTC 2018 - knut.anderssen@suse.com
+
+- AutoYaST: added 'enable_firewall' add 'start_firewall' to the
+  list of supported properties for SuSEFirewall2 profiles.
+
 -------------------------------------------------------------------
 Mon Feb  6 13:46:40 UTC 2018 - gsouza@suse.com
 

diff --git a/src/lib/y2firewall/importer_strategies/suse_firewall.rb b/src/lib/y2firewall/importer_strategies/suse_firewall.rb
@@ -57,6 +57,8 @@ class SuseFirewall
       }.freeze
 
       SUPPORTED_PROPERTIES = [
+        "enable_firewall",
+        "start_firewall",
         "FW_CONFIGURATIONS_DMZ",
         "FW_CONFIGURATIONS_EXT",
         "FW_CONFIGURATIONS_INT",
@@ -73,7 +75,8 @@ class SuseFirewall
         "FW_SERVICES_EXT_IP",
         "FW_SERVICES_INT_IP",
         "FW_LOG_ACCEPT_CRIT",
-        "FW_LOG_DROPT_ALL",
+        "FW_LOG_DROP_CRIT",
+        "FW_LOG_DROP_ALL",
         "FW_MASQUERADE"
       ].freeze
 
@@ -309,8 +312,8 @@ def ipsec_trust_zone
       # @return [String] all, unicast or off depending on the log config
       def log_denied_packets
         accept_crit = profile.fetch("FW_LOG_ACCEPT_CRIT", "no") == "yes"
-        drop_all = profile.fetch("FW_LOG_DROPT_ALL", "no") == "yes"
-        drop_crit = profile.fetch("FW_LOG_ACCEPT_CRIT", "no") == "yes"
+        drop_all = profile.fetch("FW_LOG_DROP_ALL", "no") == "yes"
+        drop_crit = profile.fetch("FW_LOG_DROP_CRIT", "no") == "yes"
 
         if drop_all
           "all"