From: Gene Czarcinski <gene@czarc.net>
Date: Fri, 15 Feb 2013 19:02:25 +0000 (-0500)
Subject: Trivial fix: in dhcp-host the name is optional
X-Git-Tag: v1.0.3-rc1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e3c1f2ebb739444098bc879059ffb09def66451;p=thirdparty%2Flibvirt.git

Trivial fix: in dhcp-host the name is optional

Although in IPv4 one must pick either mac or name, either
can be omitted.  Similarly, for IPv6, the name
can be optionally omitted.

Signed-off-by: Gene Czarcinski <gene@czarc.net>
Signed-off-by: Laine Stump <laine@laine.org>
---

diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng
index 66f32a44df..fff169b982 100644
--- a/docs/schemas/network.rng
+++ b/docs/schemas/network.rng
@@ -278,10 +278,15 @@
                 </zeroOrMore>
                 <zeroOrMore>
                   <element name="host">
-                    <optional>
-                      <attribute name="mac"><ref name="uniMacAddr"/></attribute>
-                    </optional>
-                    <attribute name="name"><text/></attribute>
+                    <choice>
+                      <group>
+                        <attribute name="mac"><ref name="uniMacAddr"/></attribute>
+                        <optional>
+                          <attribute name="name"><text/></attribute>
+                        </optional>
+                      </group>
+                      <attribute name="name"><text/></attribute>
+                    </choice>
                     <attribute name="ip"><ref name="ipAddr"/></attribute>
                   </element>
                 </zeroOrMore>