Merge e0dc12d into 49842a4

yast · Jun 1, 2020 · bf4e367 · bf4e367
2 parents 49842a4 + e0dc12d
commit bf4e367
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/package/yast2-samba-server.changes b/package/yast2-samba-server.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jun  1 09:40:31 UTC 2020 - Martin Vidner <mvidner@suse.com>
+
+- Autoyast schema: corrected problems in 'disabled' and 'share'
+  (bsc#1170886)
+- 4.3.2
+
 -------------------------------------------------------------------
 Wed May 27 13:34:52 UTC 2020 - David Diaz <dgonzalez@suse.com>
 

diff --git a/package/yast2-samba-server.spec b/package/yast2-samba-server.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-samba-server
-Version:        4.3.1
+Version:        4.3.2
 Release:        0
 Url:            https://github.com/yast/yast-samba-server
 Summary:        YaST2 - Samba Server Configuration

diff --git a/src/autoyast-rnc/samba-server.rnc b/src/autoyast-rnc/samba-server.rnc
@@ -6,7 +6,7 @@ include "common.rnc"
 
 workgroup = element workgroup { STRING }
 accounts = element accounts {
-    attribute config:type { text }?,
+    LIST,
     element account { STRING }*
 }
 
@@ -20,12 +20,15 @@ samba-server =
         element fixme { STRING }*
       }? &
       element config {
+        # WTF, this should be a "LIST", but
+        # https://github.com/yast/yast-samba-client/blob/cfd7b2c61b1cae9df1035ea8399fb10213ea0c99/src/modules/SambaConfig.pm#L536
+        # allows a hash
         attribute config:type { text }? &
         element comment { STRING }? &
         element listentry {
           MAP,
           (
-            element disabled { attribute config:type { text }? & STRING }? &
+            element disabled { BOOLEAN }? &
             element name { STRING }? &
             element comment { STRING }? &
             element parameters {
@@ -481,6 +484,6 @@ samba_options = element options {
   MAP,
   element option { MAP, samba_option_key, samba_option_val? }*
 }
-share = element share { (STRING | y2_share)* }
+share = element share { (text | y2_share)* }
 samba_option_key = element key { STRING }
 samba_option_val = element value { STRING }