Merge 8a40b32 into 8c387bf

yast · Oct 2, 2018 · a67cbdf · a67cbdf
2 parents 8c387bf + 8a40b32
commit a67cbdf
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/package/yast2-firewall.changes b/package/yast2-firewall.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Oct  2 11:52:27 UTC 2018 - knut.anderssen@suse.com
+
+- AutoYast schema:
+  - Allowed the new 'description', 'short' and 'target' elements in
+    zone entries (bsc#1108199)
+- 4.0.28
+
 -------------------------------------------------------------------
 Fri Sep 21 13:26:02 UTC 2018 - igonzalezsosa@suse.com
 

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

diff --git a/src/autoyast-rnc/firewall.rnc b/src/autoyast-rnc/firewall.rnc
@@ -126,6 +126,9 @@ zones =
     LIST,
     element (zone | listentry) {
       zone_name &
+      zone_short? &
+      zone_description? &
+      zone_target? &
       fwd_interfaces? &
       fwd_services? &
       fwd_ports? &
@@ -166,6 +169,9 @@ fwd_sources =
   }
 
 zone_name = element name { text }
+zone_short = element short { text }
+zone_description = element description { text }
+zone_target = element target { text }
 default_zone = element default_zone { text }
 masquerade = element masquerade { BOOLEAN }
 log_denied_packets = element log_denied_packets { text }