From 314d032673384956fbe791e1105e17b1a4bbb7ec Mon Sep 17 00:00:00 2001
From: Jonathan Billings <jsbillin@umich.edu>
Date: Mon, 11 Jul 2011 10:33:16 -0400
Subject: Schemas: change client.xsd, allow multiple Client entries in
 XIncluded file

For some reason, using an XIncluded file with more than one Client
on my RHEL5 systems would generate an invalid schema, even though
it was acceptable to bcfg2-server, and would pass on my Fedora 15
workstation.

This change will make bcfg2-lint on RHEL5 accept XIncluded files
with more than one Client entry.
---
 schemas/clients.xsd | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

(limited to 'schemas')

diff --git a/schemas/clients.xsd b/schemas/clients.xsd
index 09ddf22db..0a9ce5202 100644
--- a/schemas/clients.xsd
+++ b/schemas/clients.xsd
@@ -29,19 +29,13 @@
     <xsd:attribute type='xsd:string' name='address'/>
   </xsd:complexType>
 
-  <xsd:element name='Clients'>
-    <xsd:complexType>
-      <xsd:choice minOccurs='0' maxOccurs='unbounded'>
-        <xsd:element name='Client' type='ClientType'/>
-        <xsd:element name='Clients'>
-          <xsd:complexType>
-            <xsd:choice>
-              <xsd:element name='Client' type='ClientType'/>
-            </xsd:choice>
-          </xsd:complexType>
-        </xsd:element>
-      </xsd:choice>
-      <xsd:attribute name='version' type='xsd:string'/>
-    </xsd:complexType>
-  </xsd:element>
+  <xsd:complexType name='ClientsType'>
+    <xsd:choice minOccurs='0' maxOccurs='unbounded'>
+      <xsd:element name='Client' type='ClientType'/>
+      <xsd:element name='Clients' type='ClientsType'/>
+    </xsd:choice>
+    <xsd:attribute name='version' type='xsd:string'/>
+  </xsd:complexType>
+
+  <xsd:element name='Clients' type='ClientsType'/>
 </xsd:schema>
-- 
cgit v1.2.3-1-g7c22