X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=etc%2Fconfig.xsd;h=98e7518070019a6c7b7bf7d7e337461f272c1288;hb=da405c16252ce5e47f69fe153e29e3864766da0a;hp=52c4f3f98a90b478d338354b4fae40d58f7e5386;hpb=0580853c19dded1da0dc2e26298b1caaeb043e10;p=metaproxy-moved-to-github.git

diff --git a/etc/config.xsd b/etc/config.xsd
index 52c4f3f..98e7518 100644
--- a/etc/config.xsd
+++ b/etc/config.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: config.xsd,v 1.7 2006-01-16 15:49:27 mike Exp $ -->
+<!-- $Id: config.xsd,v 1.13 2006-02-02 18:20:41 mike Exp $ -->
 <!--
 	This Schema prescribes the format of YP2 configuration files.
 	Invoke it like this:
@@ -17,7 +17,7 @@
     <xs:complexType>
       <xs:sequence>
         <xs:element ref="config:start"/>
-        <xs:element ref="config:filters"/>
+        <xs:element minOccurs="0" ref="config:filters"/>
         <xs:element ref="config:routes"/>
       </xs:sequence>
     </xs:complexType>
@@ -64,7 +64,13 @@
         <xs:element minOccurs="0" maxOccurs="unbounded" ref="config:virtual"/>
 
 	<!-- type="auth_simple" -->
-	<xs:element ref="config:filename"/>
+        <xs:sequence>
+	  <xs:element minOccurs="0" ref="config:userRegister"/>
+	  <xs:element minOccurs="0" ref="config:targetRegister"/>
+	  <xs:element minOccurs="0" name="discardUnauthorisedTargets">
+	    <xs:complexType/>
+	  </xs:element>
+        </xs:sequence>
 
 	<!-- type="backend_test" -->
 	<!-- No elements included -->
@@ -100,7 +106,9 @@
   <xs:element name="port" type="xs:string"/>
   <xs:element name="timeout" type="xs:integer"/>
   <xs:element name="message" type="xs:NCName"/>
-  <xs:element name="filename" type="xs:NCName"/>
+  <xs:element name="userRegister" type="xs:string"/>
+  <xs:element name="targetRegister" type="xs:string"/>
+  <xs:element name="discardUnauthorisedTargets" type="xs:string"/>
 
   <!-- ### This is used differently depending on whether it occurs
        within a "virt_db" or "multi" filter: for the former, it
@@ -126,7 +134,7 @@
   <xs:element name="routes">
     <xs:complexType>
       <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="config:route"/>
+        <xs:element minOccurs="1" maxOccurs="unbounded" ref="config:route"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>