From 16e68373a195b0b42b495058ef358148460718dc Mon Sep 17 00:00:00 2001
From: brent s <bts@square-r00t.net>
Date: Sat, 16 May 2020 03:48:14 -0400
Subject: [PATCH] okay. so the config's cleaned up, and we now create a sparse
 example config file.

---
 schema/lib/types/he_ipv6.xsd | 23 +++++++++++++++++++++--
 schema/lib/types/std.xsd     | 10 ++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/schema/lib/types/he_ipv6.xsd b/schema/lib/types/he_ipv6.xsd
index 463665f..47a12d0 100644
--- a/schema/lib/types/he_ipv6.xsd
+++ b/schema/lib/types/he_ipv6.xsd
@@ -3,6 +3,8 @@
            elementFormDefault="qualified"
            attributeFormDefault="unqualified">
 
+  <xs:include schemaLocation="./std.xsd"/>
+
   <xs:simpleType name="t_he_ipv6_prefix">
     <xs:restriction base="xs:positiveInteger">
       <xs:enumeration value="48"/>
@@ -19,9 +21,26 @@
 
   <xs:complexType name="t_he_ipv6_ra">
     <xs:all>
-      <xs:element name="dns" type="xs:boolean" default="false"/>
-      <xs:element name="dhcpv6" type="xs:boolean" default="false"/>
+      <xs:element name="dns" default="false">
+        <xs:complexType>
+          <xs:simpleContent>
+            <xs:extension base="xs:boolean">
+              <xs:attribute name="domains" type="t_std_list_space" use="optional"/>
+            </xs:extension>
+          </xs:simpleContent>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="dhcpv6" default="false">
+        <xs:complexType>
+          <xs:simpleContent>
+            <xs:extension base="xs:boolean">
+              <xs:attribute name="domains" type="t_std_list_space" use="optional"/>
+            </xs:extension>
+          </xs:simpleContent>
+        </xs:complexType>
+      </xs:element>
     </xs:all>
+    <xs:attribute name="tag" type="xs:token" use="optional"/>
   </xs:complexType>
 
   <xs:simpleType name="t_he_ipv6_ra_providers">
diff --git a/schema/lib/types/std.xsd b/schema/lib/types/std.xsd
index 78d3d49..22e315f 100644
--- a/schema/lib/types/std.xsd
+++ b/schema/lib/types/std.xsd
@@ -35,6 +35,16 @@
         <!-- positiveInteger is used for UNIX Epoch. -->
         <xs:union memberTypes="xs:dateTime xs:positiveInteger"/>
     </xs:simpleType>
+    
+    <xs:simpleType name="t_std_list_comma">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[^,]+(,[^,])*"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="t_std_list_space">
+        <xs:list itemType="xs:token"/>
+    </xs:simpleType>
 
     <xs:simpleType name="t_std_nonempty">
         <xs:restriction base="xs:token">