directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1445634 [6/9] - /directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/
Date Wed, 13 Feb 2013 14:49:04 GMT
Modified: directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/cosine.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/cosine.xml?rev=1445634&r1=1445633&r2=1445634&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/cosine.xml (original)
+++ directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/cosine.xml Wed Feb 13 14:49:03 2013
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
@@ -17,74 +16,80 @@
   specific language governing permissions and limitations
   under the License.
 -->
+<?xml version="1.0" encoding="UTF-8"?>
 <schema name="cosine">
   <attributetypes>
-    <attributetype oid="0.9.2342.19200300.100.1.10" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.12" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>manager</alias>
+        <alias>documentTitle</alias>
       </aliases>
-      <description>RFC1274: DN of manager</description>
+      <description>RFC1274: title of document</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
-      <equality>distinguishedNameMatch</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+      <equality>caseIgnoreMatch</equality>
+      <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.11" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.50" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>documentIdentifier</alias>
+        <alias>singleLevelQuality</alias>
       </aliases>
-      <description>RFC1274: unique identifier of document</description>
+      <description>RFC1274: Single Level Quality</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
-      <equality>caseIgnoreMatch</equality>
-      <substring>caseIgnoreSubstringsMatch</substring>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.13</syntax>
     </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.12" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.7" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>documentTitle</alias>
+        <alias>photo</alias>
       </aliases>
-      <description>RFC1274: title of document</description>
+      <description>RFC1274: photo (G3 fax)</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
-      <equality>caseIgnoreMatch</equality>
-      <substring>caseIgnoreSubstringsMatch</substring>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.23</syntax>
     </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.13" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.41" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>documentVersion</alias>
+        <alias>mobile</alias>
+        <alias>mobileTelephoneNumber</alias>
       </aliases>
-      <description>RFC1274: version of document</description>
+      <description>RFC1274: mobile telephone number</description>
+      <usage>USER_APPLICATIONS</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.50</syntax>
+      <equality>telephoneNumberMatch</equality>
+      <substring>telephoneNumberSubstringsMatch</substring>
+    </attributetype>
+    <attributetype oid="0.9.2342.19200300.100.1.44" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+      <aliases>
+        <alias>uniqueIdentifier</alias>
+      </aliases>
+      <description>RFC1274: unique identifer</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
       <equality>caseIgnoreMatch</equality>
-      <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.14" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.47" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>documentAuthor</alias>
+        <alias>mailPreferenceOption</alias>
       </aliases>
-      <description>RFC1274: DN of author of document</description>
+      <description>RFC1274: mail preference option</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
-      <equality>distinguishedNameMatch</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
     </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.15" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.42" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>documentLocation</alias>
+        <alias>pager</alias>
+        <alias>pagerTelephoneNumber</alias>
       </aliases>
-      <description>RFC1274: location of document original</description>
+      <description>RFC1274: pager telephone number</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
-      <equality>caseIgnoreMatch</equality>
-      <substring>caseIgnoreSubstringsMatch</substring>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.50</syntax>
+      <equality>telephoneNumberMatch</equality>
+      <substring>telephoneNumberSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.2" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.22" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>textEncodedORAddress</alias>
+        <alias>otherMailbox</alias>
       </aliases>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
-      <equality>caseIgnoreMatch</equality>
-      <substring>caseIgnoreSubstringsMatch</substring>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.39</syntax>
     </attributetype>
     <attributetype oid="0.9.2342.19200300.100.1.20" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
@@ -97,37 +102,33 @@
       <equality>telephoneNumberMatch</equality>
       <substring>telephoneNumberSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.21" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
-      <aliases>
-        <alias>secretary</alias>
-      </aliases>
-      <description>RFC1274: DN of secretary</description>
-      <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
-      <equality>distinguishedNameMatch</equality>
-    </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.22" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.8" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>otherMailbox</alias>
+        <alias>userClass</alias>
       </aliases>
+      <description>RFC1274: categorory of user</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.39</syntax>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+      <equality>caseIgnoreMatch</equality>
+      <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.26" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.30" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>aRecord</alias>
+        <alias>sOARecord</alias>
       </aliases>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
       <equality>caseIgnoreIA5Match</equality>
     </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.27" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.9" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>mDRecord</alias>
+        <alias>host</alias>
       </aliases>
+      <description>RFC1274: host computer</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseIgnoreIA5Match</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+      <equality>caseIgnoreMatch</equality>
+      <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
     <attributetype oid="0.9.2342.19200300.100.1.28" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
@@ -137,21 +138,25 @@
       <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
       <equality>caseIgnoreIA5Match</equality>
     </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.29" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.40" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>nSRecord</alias>
+        <alias>personalTitle</alias>
       </aliases>
+      <description>RFC1274: personal title</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseIgnoreIA5Match</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+      <equality>caseIgnoreMatch</equality>
+      <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.30" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.4" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>sOARecord</alias>
+        <alias>info</alias>
       </aliases>
+      <description>RFC1274: general information</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseIgnoreIA5Match</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+      <equality>caseIgnoreMatch</equality>
+      <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
     <attributetype oid="0.9.2342.19200300.100.1.31" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
@@ -161,124 +166,122 @@
       <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
       <equality>caseIgnoreIA5Match</equality>
     </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.38" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.13" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>associatedName</alias>
+        <alias>documentVersion</alias>
       </aliases>
-      <description>RFC1274: DN of entry associated with domain</description>
+      <description>RFC1274: version of document</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
-      <equality>distinguishedNameMatch</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+      <equality>caseIgnoreMatch</equality>
+      <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.39" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.10" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>homePostalAddress</alias>
+        <alias>manager</alias>
       </aliases>
-      <description>RFC1274: home postal address</description>
+      <description>RFC1274: DN of manager</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.41</syntax>
-      <equality>caseIgnoreListMatch</equality>
-      <substring>caseIgnoreListSubstringsMatch</substring>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+      <equality>distinguishedNameMatch</equality>
     </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.4" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.14" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>info</alias>
+        <alias>documentAuthor</alias>
       </aliases>
-      <description>RFC1274: general information</description>
+      <description>RFC1274: DN of author of document</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
-      <equality>caseIgnoreMatch</equality>
-      <substring>caseIgnoreSubstringsMatch</substring>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+      <equality>distinguishedNameMatch</equality>
     </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.40" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.26" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>personalTitle</alias>
+        <alias>aRecord</alias>
       </aliases>
-      <description>RFC1274: personal title</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
-      <equality>caseIgnoreMatch</equality>
-      <substring>caseIgnoreSubstringsMatch</substring>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+      <equality>caseIgnoreIA5Match</equality>
     </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.41" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.29" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>mobile</alias>
-        <alias>mobileTelephoneNumber</alias>
+        <alias>nSRecord</alias>
       </aliases>
-      <description>RFC1274: mobile telephone number</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.50</syntax>
-      <equality>telephoneNumberMatch</equality>
-      <substring>telephoneNumberSubstringsMatch</substring>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+      <equality>caseIgnoreIA5Match</equality>
     </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.42" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.39" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>pager</alias>
-        <alias>pagerTelephoneNumber</alias>
+        <alias>homePostalAddress</alias>
       </aliases>
-      <description>RFC1274: pager telephone number</description>
+      <description>RFC1274: home postal address</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.50</syntax>
-      <equality>telephoneNumberMatch</equality>
-      <substring>telephoneNumberSubstringsMatch</substring>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.41</syntax>
+      <equality>caseIgnoreListMatch</equality>
+      <substring>caseIgnoreListSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.43" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.11" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>co</alias>
-        <alias>friendlyCountryName</alias>
+        <alias>documentIdentifier</alias>
       </aliases>
-      <description>RFC1274: friendly country name</description>
+      <description>RFC1274: unique identifier of document</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
       <equality>caseIgnoreMatch</equality>
       <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.44" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.27" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>uniqueIdentifier</alias>
+        <alias>mDRecord</alias>
       </aliases>
-      <description>RFC1274: unique identifer</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
-      <equality>caseIgnoreMatch</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+      <equality>caseIgnoreIA5Match</equality>
     </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.45" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.56" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>organizationalStatus</alias>
+        <alias>documentPublisher</alias>
       </aliases>
-      <description>RFC1274: organizational status</description>
+      <description>RFC1274: publisher of document</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
       <equality>caseIgnoreMatch</equality>
       <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.46" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.52" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>janetMailbox</alias>
+        <alias>subtreeMaximumQuality</alias>
       </aliases>
-      <description>RFC1274: Janet mailbox</description>
+      <description>RFC1274: Subtree Maximun Quality</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseIgnoreIA5Match</equality>
-      <substring>caseIgnoreIA5SubstringsMatch</substring>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.13</syntax>
     </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.47" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.15" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>mailPreferenceOption</alias>
+        <alias>documentLocation</alias>
       </aliases>
-      <description>RFC1274: mail preference option</description>
+      <description>RFC1274: location of document original</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+      <equality>caseIgnoreMatch</equality>
+      <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.48" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.53" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>buildingName</alias>
+        <alias>personalSignature</alias>
       </aliases>
-      <description>RFC1274: name of building</description>
+      <description>RFC1274: Personal Signature (G3 fax)</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
-      <equality>caseIgnoreMatch</equality>
-      <substring>caseIgnoreSubstringsMatch</substring>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.23</syntax>
+    </attributetype>
+    <attributetype oid="0.9.2342.19200300.100.1.21" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+      <aliases>
+        <alias>secretary</alias>
+      </aliases>
+      <description>RFC1274: DN of secretary</description>
+      <usage>USER_APPLICATIONS</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+      <equality>distinguishedNameMatch</equality>
     </attributetype>
     <attributetype oid="0.9.2342.19200300.100.1.49" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
@@ -288,6 +291,15 @@
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.19</syntax>
     </attributetype>
+    <attributetype oid="0.9.2342.19200300.100.1.2" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+      <aliases>
+        <alias>textEncodedORAddress</alias>
+      </aliases>
+      <usage>USER_APPLICATIONS</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+      <equality>caseIgnoreMatch</equality>
+      <substring>caseIgnoreSubstringsMatch</substring>
+    </attributetype>
     <attributetype oid="0.9.2342.19200300.100.1.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
         <alias>drink</alias>
@@ -299,37 +311,41 @@
       <equality>caseIgnoreMatch</equality>
       <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.50" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.55" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>singleLevelQuality</alias>
+        <alias>audio</alias>
       </aliases>
-      <description>RFC1274: Single Level Quality</description>
+      <description>RFC1274: audio (u-law)</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.13</syntax>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.4</syntax>
     </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.51" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.46" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>subtreeMinimumQuality</alias>
+        <alias>janetMailbox</alias>
       </aliases>
-      <description>RFC1274: Subtree Mininum Quality</description>
+      <description>RFC1274: Janet mailbox</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.13</syntax>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+      <equality>caseIgnoreIA5Match</equality>
+      <substring>caseIgnoreIA5SubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.52" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.6" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>subtreeMaximumQuality</alias>
+        <alias>roomNumber</alias>
       </aliases>
-      <description>RFC1274: Subtree Maximun Quality</description>
+      <description>RFC1274: room number</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.13</syntax>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+      <equality>caseIgnoreMatch</equality>
+      <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.53" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.51" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>personalSignature</alias>
+        <alias>subtreeMinimumQuality</alias>
       </aliases>
-      <description>RFC1274: Personal Signature (G3 fax)</description>
+      <description>RFC1274: Subtree Mininum Quality</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.23</syntax>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.13</syntax>
     </attributetype>
     <attributetype oid="0.9.2342.19200300.100.1.54" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
@@ -340,57 +356,41 @@
       <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
       <equality>distinguishedNameMatch</equality>
     </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.55" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
-      <aliases>
-        <alias>audio</alias>
-      </aliases>
-      <description>RFC1274: audio (u-law)</description>
-      <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.4</syntax>
-    </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.56" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.43" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>documentPublisher</alias>
+        <alias>co</alias>
+        <alias>friendlyCountryName</alias>
       </aliases>
-      <description>RFC1274: publisher of document</description>
+      <description>RFC1274: friendly country name</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
       <equality>caseIgnoreMatch</equality>
       <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.6" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.48" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>roomNumber</alias>
+        <alias>buildingName</alias>
       </aliases>
-      <description>RFC1274: room number</description>
+      <description>RFC1274: name of building</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
       <equality>caseIgnoreMatch</equality>
       <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.7" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
-      <aliases>
-        <alias>photo</alias>
-      </aliases>
-      <description>RFC1274: photo (G3 fax)</description>
-      <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.23</syntax>
-    </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.8" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.38" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>userClass</alias>
+        <alias>associatedName</alias>
       </aliases>
-      <description>RFC1274: categorory of user</description>
+      <description>RFC1274: DN of entry associated with domain</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
-      <equality>caseIgnoreMatch</equality>
-      <substring>caseIgnoreSubstringsMatch</substring>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+      <equality>distinguishedNameMatch</equality>
     </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.9" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.45" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>host</alias>
+        <alias>organizationalStatus</alias>
       </aliases>
-      <description>RFC1274: host computer</description>
+      <description>RFC1274: organizational status</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
       <equality>caseIgnoreMatch</equality>
@@ -435,50 +435,35 @@
         <attributetype>x121Address</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="0.9.2342.19200300.100.4.14" obsolete="false">
+    <objectclass oid="0.9.2342.19200300.100.4.4" obsolete="false">
       <aliases>
-        <alias>RFC822localPart</alias>
+        <alias>pilotPerson</alias>
+        <alias>newPilotPerson</alias>
       </aliases>
       <superiors>
-        <superior>domain</superior>
+        <superior>person</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <optional>
-        <attributetype>cn</attributetype>
-        <attributetype>sn</attributetype>
-        <attributetype>description</attributetype>
-        <attributetype>seeAlso</attributetype>
-        <attributetype>telephoneNumber</attributetype>
-        <attributetype>physicalDeliveryOfficeName</attributetype>
-        <attributetype>postalAddress</attributetype>
-        <attributetype>postalCode</attributetype>
-        <attributetype>postOfficeBox</attributetype>
-        <attributetype>street</attributetype>
-        <attributetype>facsimileTelephoneNumber</attributetype>
-        <attributetype>internationaliSDNNumber</attributetype>
-        <attributetype>teletexTerminalIdentifier</attributetype>
-        <attributetype>telexNumber</attributetype>
+        <attributetype>uid</attributetype>
+        <attributetype>textEncodedORAddress</attributetype>
+        <attributetype>mail</attributetype>
+        <attributetype>drink</attributetype>
+        <attributetype>roomNumber</attributetype>
+        <attributetype>userClass</attributetype>
+        <attributetype>homePhone</attributetype>
+        <attributetype>homePostalAddress</attributetype>
+        <attributetype>secretary</attributetype>
+        <attributetype>personalTitle</attributetype>
         <attributetype>preferredDeliveryMethod</attributetype>
-        <attributetype>destinationIndicator</attributetype>
-        <attributetype>registeredAddress</attributetype>
-        <attributetype>x121Address</attributetype>
-      </optional>
-    </objectclass>
-    <objectclass oid="0.9.2342.19200300.100.4.15" obsolete="false">
-      <aliases>
-        <alias>dNSDomain</alias>
-      </aliases>
-      <superiors>
-        <superior>domain</superior>
-      </superiors>
-      <type>STRUCTURAL</type>
-      <optional>
-        <attributetype>aRecord</attributetype>
-        <attributetype>mDRecord</attributetype>
-        <attributetype>mXRecord</attributetype>
-        <attributetype>nSRecord</attributetype>
-        <attributetype>sOARecord</attributetype>
-        <attributetype>cNAMERecord</attributetype>
+        <attributetype>businessCategory</attributetype>
+        <attributetype>janetMailbox</attributetype>
+        <attributetype>otherMailbox</attributetype>
+        <attributetype>mobile</attributetype>
+        <attributetype>pager</attributetype>
+        <attributetype>organizationalStatus</attributetype>
+        <attributetype>mailPreferenceOption</attributetype>
+        <attributetype>personalSignature</attributetype>
       </optional>
     </objectclass>
     <objectclass oid="0.9.2342.19200300.100.4.17" obsolete="false">
@@ -494,41 +479,66 @@
         <attributetype>associatedDomain</attributetype>
       </mandatory>
     </objectclass>
-    <objectclass oid="0.9.2342.19200300.100.4.18" obsolete="false">
+    <objectclass oid="0.9.2342.19200300.100.4.21" obsolete="false">
       <aliases>
-        <alias>friendlyCountry</alias>
+        <alias>pilotDSA</alias>
       </aliases>
       <superiors>
-        <superior>country</superior>
+        <superior>dSA</superior>
+      </superiors>
+      <type>STRUCTURAL</type>
+      <optional>
+        <attributetype>dSAQuality</attributetype>
+      </optional>
+    </objectclass>
+    <objectclass oid="0.9.2342.19200300.100.4.5" obsolete="false">
+      <aliases>
+        <alias>account</alias>
+      </aliases>
+      <superiors>
+        <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
-        <attributetype>co</attributetype>
+        <attributetype>uid</attributetype>
       </mandatory>
+      <optional>
+        <attributetype>description</attributetype>
+        <attributetype>seeAlso</attributetype>
+        <attributetype>l</attributetype>
+        <attributetype>o</attributetype>
+        <attributetype>ou</attributetype>
+        <attributetype>host</attributetype>
+      </optional>
     </objectclass>
-    <objectclass oid="0.9.2342.19200300.100.4.20" obsolete="false">
+    <objectclass oid="0.9.2342.19200300.100.4.15" obsolete="false">
       <aliases>
-        <alias>pilotOrganization</alias>
+        <alias>dNSDomain</alias>
       </aliases>
       <superiors>
-        <superior>organization</superior>
-        <superior>organizationalUnit</superior>
+        <superior>domain</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <optional>
-        <attributetype>buildingName</attributetype>
+        <attributetype>aRecord</attributetype>
+        <attributetype>mDRecord</attributetype>
+        <attributetype>mXRecord</attributetype>
+        <attributetype>nSRecord</attributetype>
+        <attributetype>sOARecord</attributetype>
+        <attributetype>cNAMERecord</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="0.9.2342.19200300.100.4.21" obsolete="false">
+    <objectclass oid="0.9.2342.19200300.100.4.20" obsolete="false">
       <aliases>
-        <alias>pilotDSA</alias>
+        <alias>pilotOrganization</alias>
       </aliases>
       <superiors>
-        <superior>dSA</superior>
+        <superior>organization</superior>
+        <superior>organizationalUnit</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <optional>
-        <attributetype>dSAQuality</attributetype>
+        <attributetype>buildingName</attributetype>
       </optional>
     </objectclass>
     <objectclass oid="0.9.2342.19200300.100.4.22" obsolete="false">
@@ -547,55 +557,53 @@
         <attributetype>subtreeMaximumQuality</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="0.9.2342.19200300.100.4.4" obsolete="false">
+    <objectclass oid="0.9.2342.19200300.100.4.9" obsolete="false">
       <aliases>
-        <alias>pilotPerson</alias>
-        <alias>newPilotPerson</alias>
+        <alias>documentSeries</alias>
       </aliases>
       <superiors>
-        <superior>person</superior>
+        <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
+      <mandatory>
+        <attributetype>cn</attributetype>
+      </mandatory>
       <optional>
-        <attributetype>uid</attributetype>
-        <attributetype>textEncodedORAddress</attributetype>
-        <attributetype>mail</attributetype>
-        <attributetype>drink</attributetype>
-        <attributetype>roomNumber</attributetype>
-        <attributetype>userClass</attributetype>
-        <attributetype>homePhone</attributetype>
-        <attributetype>homePostalAddress</attributetype>
-        <attributetype>secretary</attributetype>
-        <attributetype>personalTitle</attributetype>
-        <attributetype>preferredDeliveryMethod</attributetype>
-        <attributetype>businessCategory</attributetype>
-        <attributetype>janetMailbox</attributetype>
-        <attributetype>otherMailbox</attributetype>
-        <attributetype>mobile</attributetype>
-        <attributetype>pager</attributetype>
-        <attributetype>organizationalStatus</attributetype>
-        <attributetype>mailPreferenceOption</attributetype>
-        <attributetype>personalSignature</attributetype>
+        <attributetype>description</attributetype>
+        <attributetype>seeAlso</attributetype>
+        <attributetype>telephoneNumber</attributetype>
+        <attributetype>l</attributetype>
+        <attributetype>o</attributetype>
+        <attributetype>ou</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="0.9.2342.19200300.100.4.5" obsolete="false">
+    <objectclass oid="0.9.2342.19200300.100.4.14" obsolete="false">
       <aliases>
-        <alias>account</alias>
+        <alias>RFC822localPart</alias>
       </aliases>
       <superiors>
-        <superior>top</superior>
+        <superior>domain</superior>
       </superiors>
       <type>STRUCTURAL</type>
-      <mandatory>
-        <attributetype>uid</attributetype>
-      </mandatory>
       <optional>
+        <attributetype>cn</attributetype>
+        <attributetype>sn</attributetype>
         <attributetype>description</attributetype>
         <attributetype>seeAlso</attributetype>
-        <attributetype>l</attributetype>
-        <attributetype>o</attributetype>
-        <attributetype>ou</attributetype>
-        <attributetype>host</attributetype>
+        <attributetype>telephoneNumber</attributetype>
+        <attributetype>physicalDeliveryOfficeName</attributetype>
+        <attributetype>postalAddress</attributetype>
+        <attributetype>postalCode</attributetype>
+        <attributetype>postOfficeBox</attributetype>
+        <attributetype>street</attributetype>
+        <attributetype>facsimileTelephoneNumber</attributetype>
+        <attributetype>internationaliSDNNumber</attributetype>
+        <attributetype>teletexTerminalIdentifier</attributetype>
+        <attributetype>telexNumber</attributetype>
+        <attributetype>preferredDeliveryMethod</attributetype>
+        <attributetype>destinationIndicator</attributetype>
+        <attributetype>registeredAddress</attributetype>
+        <attributetype>x121Address</attributetype>
       </optional>
     </objectclass>
     <objectclass oid="0.9.2342.19200300.100.4.6" obsolete="false">
@@ -623,27 +631,21 @@
         <attributetype>documentPublisher</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="0.9.2342.19200300.100.4.7" obsolete="false">
+    <objectclass oid="0.9.2342.19200300.100.4.18" obsolete="false">
       <aliases>
-        <alias>room</alias>
+        <alias>friendlyCountry</alias>
       </aliases>
       <superiors>
-        <superior>top</superior>
+        <superior>country</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
-        <attributetype>cn</attributetype>
+        <attributetype>co</attributetype>
       </mandatory>
-      <optional>
-        <attributetype>roomNumber</attributetype>
-        <attributetype>description</attributetype>
-        <attributetype>seeAlso</attributetype>
-        <attributetype>telephoneNumber</attributetype>
-      </optional>
     </objectclass>
-    <objectclass oid="0.9.2342.19200300.100.4.9" obsolete="false">
+    <objectclass oid="0.9.2342.19200300.100.4.7" obsolete="false">
       <aliases>
-        <alias>documentSeries</alias>
+        <alias>room</alias>
       </aliases>
       <superiors>
         <superior>top</superior>
@@ -653,12 +655,10 @@
         <attributetype>cn</attributetype>
       </mandatory>
       <optional>
+        <attributetype>roomNumber</attributetype>
         <attributetype>description</attributetype>
         <attributetype>seeAlso</attributetype>
         <attributetype>telephoneNumber</attributetype>
-        <attributetype>l</attributetype>
-        <attributetype>o</attributetype>
-        <attributetype>ou</attributetype>
       </optional>
     </objectclass>
   </objectclasses>

Modified: directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/dhcp.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/dhcp.xml?rev=1445634&r1=1445633&r2=1445634&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/dhcp.xml (original)
+++ directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/dhcp.xml Wed Feb 13 14:49:03 2013
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
@@ -17,115 +16,124 @@
   specific language governing permissions and limitations
   under the License.
 -->
+<?xml version="1.0" encoding="UTF-8"?>
 <schema name="dhcp">
   <attributetypes>
-    <attributetype oid="2.16.840.1.113719.1.203.4.1" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.2" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpPrimaryDN</alias>
+        <alias>dhcpSecondaryDN</alias>
       </aliases>
-      <description>The DN of the dhcpServer which is the primary server for the configuration.</description>
+      <description>The DN of dhcpServer(s) which provide backup service for the configuration.</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
       <equality>distinguishedNameMatch</equality>
     </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.10" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.12" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpHostDN</alias>
+        <alias>dhcpGroupDN</alias>
       </aliases>
-      <description>the distinguished name(s) of the dhcpHost objects.</description>
+      <description>The distinguished name(s) of the groups.</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
       <equality>distinguishedNameMatch</equality>
     </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.11" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.31" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpPoolDN</alias>
+        <alias>dhcpReservedForClient</alias>
       </aliases>
-      <description>The distinguished name(s) of pools.</description>
+      <description>The distinguished name of a "dhcpClient" that an address is reserved for. This may not be the same as the "dhcpAssignedToClient" attribute if the address is being reassigned but the current lease has not yet expired.</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
       <equality>distinguishedNameMatch</equality>
     </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.12" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.36" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpGroupDN</alias>
+        <alias>dhcpDelayedServiceParameter</alias>
       </aliases>
-      <description>The distinguished name(s) of the groups.</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
-      <equality>distinguishedNameMatch</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+      <equality>integerMatch</equality>
     </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.13" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.25" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpSubnetDN</alias>
+        <alias>dhcpLastTransactionTime</alias>
       </aliases>
-      <description>The distinguished name(s) of the subnets.</description>
+      <description>This is the last time a valid DHCP packet was received from the client.</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
-      <equality>distinguishedNameMatch</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
+      <equality>integerMatch</equality>
     </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.14" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.18" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpLeaseDN</alias>
+        <alias>dhcpSharedNetworkDN</alias>
       </aliases>
-      <description>The distinguished name of a client address.</description>
+      <description>The distinguished name(s) of sharedNetworks.</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
       <equality>distinguishedNameMatch</equality>
     </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.15" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.30" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpLeasesDN</alias>
+        <alias>dhcpAssignedHostName</alias>
       </aliases>
-      <description>The distinguished name(s) client addresses.</description>
+      <description>This is the actual hostname that was assigned to a client. It may not be the name that was requested by the client. The fully qualified domain name can be determined by appending the value of "dhcpDomainName" (with a dot separator) to this name.</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
-      <equality>distinguishedNameMatch</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+      <equality>caseIgnoreIA5Match</equality>
     </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.16" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.32" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpClassesDN</alias>
+        <alias>dhcpAssignedToClient</alias>
       </aliases>
-      <description>The distinguished name(s) of a class(es) in a subclass.</description>
+      <description>This is the distinguished name of a "dhcpClient" that an address is currently assigned to. This attribute is only present in the class when the address is leased.</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
       <equality>distinguishedNameMatch</equality>
     </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.17" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.7" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpSubclassesDN</alias>
+        <alias>dhcpOption</alias>
       </aliases>
-      <description>The distinguished name(s) of subclass(es).</description>
+      <description>Encoded option values to be sent to clients. Each value represents a single option and contains (OptionTag, Length, OptionValue) encoded in the format used by DHCP.</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
-      <equality>distinguishedNameMatch</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.40</syntax>
+      <equality>caseIgnoreIA5Match</equality>
     </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.18" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.13" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpSharedNetworkDN</alias>
+        <alias>dhcpSubnetDN</alias>
       </aliases>
-      <description>The distinguished name(s) of sharedNetworks.</description>
+      <description>The distinguished name(s) of the subnets.</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
       <equality>distinguishedNameMatch</equality>
     </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.19" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.15" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpServiceDN</alias>
+        <alias>dhcpLeasesDN</alias>
       </aliases>
-      <description>The DN of dhcpService object(s)which contain the configuration information. Each dhcpServer object has this attribute identifying the DHCP configuration(s) that the server is associated with.</description>
+      <description>The distinguished name(s) client addresses.</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
       <equality>distinguishedNameMatch</equality>
     </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.2" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.38" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpSecondaryDN</alias>
+        <alias>dhcpFailOverEndpointState</alias>
       </aliases>
-      <description>The DN of dhcpServer(s) which provide backup service for the configuration.</description>
+      <description>Server (Failover Endpoint) state, as defined in DHCP Failover Protocol [FAILOVR]</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
-      <equality>distinguishedNameMatch</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+      <equality>integerMatch</equality>
+    </attributetype>
+    <attributetype oid="2.16.840.1.113719.1.203.4.23" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+      <aliases>
+        <alias>dhcpExpirationTime</alias>
+      </aliases>
+      <description>This is the time the current lease for an address expires.</description>
+      <usage>USER_APPLICATIONS</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
+      <equality>integerMatch</equality>
     </attributetype>
     <attributetype oid="2.16.840.1.113719.1.203.4.20" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
@@ -136,50 +144,50 @@
       <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
       <equality>caseIgnoreIA5Match</equality>
     </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.21" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.8" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpImplementation</alias>
+        <alias>dhcpClassData</alias>
       </aliases>
-      <description>Description of the DHCP Server implementation e.g. DHCP Servers vendor.</description>
+      <description>Encoded text string or list of bytes expressed in hexadecimal, separated by colons. Clients match subclasses based on matching the class data with the results of match or spawn with statements in the class name declarations.</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
       <equality>caseIgnoreIA5Match</equality>
     </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.22" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.37" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpAddressState</alias>
+        <alias>dhcpMaxClientLeadTime</alias>
       </aliases>
-      <description>This stores information about the current binding-status of an address. For dynamic addresses managed by DHCP, the values should be restricted to the following: "FREE", "ACTIVE", "EXPIRED", "RELEASED", "RESET", "ABANDONED", "BACKUP". For other addresses, it SHOULD be one of the following: "UNKNOWN", "RESERVED" (an address that is managed by DHCP that is reserved for a specific client), "RESERVED-ACTIVE" (same as reserved, but address is currently in use), "ASSIGNED" (assigned manually or by some other mechanism), "UNASSIGNED", "NOTASSIGNABLE".</description>
+      <description>Maximum Client Lead Time configuration in seconds, as defined in DHCP Failover Protocol [FAILOVR]</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseIgnoreIA5Match</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+      <equality>integerMatch</equality>
     </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.23" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.16" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpExpirationTime</alias>
+        <alias>dhcpClassesDN</alias>
       </aliases>
-      <description>This is the time the current lease for an address expires.</description>
+      <description>The distinguished name(s) of a class(es) in a subclass.</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
-      <equality>integerMatch</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+      <equality>distinguishedNameMatch</equality>
     </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.24" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.1" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpStartTimeOfState</alias>
+        <alias>dhcpPrimaryDN</alias>
       </aliases>
-      <description>This is the time of the last state change for a leased address.</description>
+      <description>The DN of the dhcpServer which is the primary server for the configuration.</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
-      <equality>integerMatch</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+      <equality>distinguishedNameMatch</equality>
     </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.25" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.17" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpLastTransactionTime</alias>
+        <alias>dhcpSubclassesDN</alias>
       </aliases>
-      <description>This is the last time a valid DHCP packet was received from the client.</description>
+      <description>The distinguished name(s) of subclass(es).</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
-      <equality>integerMatch</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+      <equality>distinguishedNameMatch</equality>
     </attributetype>
     <attributetype oid="2.16.840.1.113719.1.203.4.26" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
@@ -190,130 +198,113 @@
       <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
       <equality>integerMatch</equality>
     </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.27" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.9" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpDomainName</alias>
+        <alias>dhcpOptionsDN</alias>
       </aliases>
-      <description>This is the name of the domain sent to the client by the server. It is essentially the same as the value for DHCP option 15 sent to the client, and represents only the domain - not the full FQDN. To obtain the full FQDN assigned to the client you must prepend the "dhcpAssignedHostName" to this value with a ".".</description>
+      <description>The distinguished name(s) of the dhcpOption objects containing the configuration options provided by the server.</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseIgnoreIA5Match</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+      <equality>distinguishedNameMatch</equality>
     </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.28" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.34" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpDnsStatus</alias>
+        <alias>dhcpHWAddress</alias>
       </aliases>
-      <description>This indicates the status of updating DNS resource records on behalf of the client by the DHCP server for this address. The value is a 16-bit bitmask.</description>
+      <description>The clients hardware address that requested this IP address.</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
-      <equality>integerMatch</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.40</syntax>
+      <equality>caseIgnoreIA5Match</equality>
     </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.29" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.35" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpRequestedHostName</alias>
+        <alias>dhcpHashBucketAssignment</alias>
       </aliases>
-      <description>This is the hostname that was requested by the client.</description>
+      <description>HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load Balancing Algorithm [RFC 3074].</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.40</syntax>
       <equality>caseIgnoreIA5Match</equality>
     </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.3" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.39" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpStatements</alias>
+        <alias>dhcpErrorLog</alias>
       </aliases>
-      <description>Flexible storage for specific data depending on what object this exists in. Like conditional statements, server parameters, etc. This allows the standard to evolve without needing to adjust the schema.</description>
+      <description>Generic error log attribute that allows logging error conditions within a dhcpService or a dhcpSubnet, like no IP addresses available for lease.</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
       <equality>caseIgnoreIA5Match</equality>
     </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.30" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.22" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpAssignedHostName</alias>
+        <alias>dhcpAddressState</alias>
       </aliases>
-      <description>This is the actual hostname that was assigned to a client. It may not be the name that was requested by the client. The fully qualified domain name can be determined by appending the value of "dhcpDomainName" (with a dot separator) to this name.</description>
+      <description>This stores information about the current binding-status of an address. For dynamic addresses managed by DHCP, the values should be restricted to the following: "FREE", "ACTIVE", "EXPIRED", "RELEASED", "RESET", "ABANDONED", "BACKUP". For other addresses, it SHOULD be one of the following: "UNKNOWN", "RESERVED" (an address that is managed by DHCP that is reserved for a specific client), "RESERVED-ACTIVE" (same as reserved, but address is currently in use), "ASSIGNED" (assigned manually or by some other mechanism), "UNASSIGNED", "NOTASSIGNABLE".</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
       <equality>caseIgnoreIA5Match</equality>
     </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.31" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
-      <aliases>
-        <alias>dhcpReservedForClient</alias>
-      </aliases>
-      <description>The distinguished name of a "dhcpClient" that an address is reserved for. This may not be the same as the "dhcpAssignedToClient" attribute if the address is being reassigned but the current lease has not yet expired.</description>
-      <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
-      <equality>distinguishedNameMatch</equality>
-    </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.32" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.11" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpAssignedToClient</alias>
+        <alias>dhcpPoolDN</alias>
       </aliases>
-      <description>This is the distinguished name of a "dhcpClient" that an address is currently assigned to. This attribute is only present in the class when the address is leased.</description>
+      <description>The distinguished name(s) of pools.</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
       <equality>distinguishedNameMatch</equality>
     </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.33" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.28" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpRelayAgentInfo</alias>
+        <alias>dhcpDnsStatus</alias>
       </aliases>
-      <description>If the client request was received via a relay agent, this contains information about the relay agent that was available from the DHCP request. This is a hex-encoded option value.</description>
+      <description>This indicates the status of updating DNS resource records on behalf of the client by the DHCP server for this address. The value is a 16-bit bitmask.</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.40</syntax>
-      <equality>caseIgnoreIA5Match</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+      <equality>integerMatch</equality>
     </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.34" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.19" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpHWAddress</alias>
+        <alias>dhcpServiceDN</alias>
       </aliases>
-      <description>The clients hardware address that requested this IP address.</description>
+      <description>The DN of dhcpService object(s)which contain the configuration information. Each dhcpServer object has this attribute identifying the DHCP configuration(s) that the server is associated with.</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.40</syntax>
-      <equality>caseIgnoreIA5Match</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+      <equality>distinguishedNameMatch</equality>
     </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.35" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.29" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpHashBucketAssignment</alias>
+        <alias>dhcpRequestedHostName</alias>
       </aliases>
-      <description>HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load Balancing Algorithm [RFC 3074].</description>
+      <description>This is the hostname that was requested by the client.</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.40</syntax>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
       <equality>caseIgnoreIA5Match</equality>
     </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.36" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
-      <aliases>
-        <alias>dhcpDelayedServiceParameter</alias>
-      </aliases>
-      <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
-      <equality>integerMatch</equality>
-    </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.37" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.24" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpMaxClientLeadTime</alias>
+        <alias>dhcpStartTimeOfState</alias>
       </aliases>
-      <description>Maximum Client Lead Time configuration in seconds, as defined in DHCP Failover Protocol [FAILOVR]</description>
+      <description>This is the time of the last state change for a leased address.</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
       <equality>integerMatch</equality>
     </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.38" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpFailOverEndpointState</alias>
+        <alias>dhcpPermitList</alias>
       </aliases>
-      <description>Server (Failover Endpoint) state, as defined in DHCP Failover Protocol [FAILOVR]</description>
+      <description>This attribute contains the permit lists associated with a pool. Each permit list is defined as a separate value.</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>integerMatch</equality>
+      <equality>caseIgnoreIA5Match</equality>
     </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.39" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.10" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpErrorLog</alias>
+        <alias>dhcpHostDN</alias>
       </aliases>
-      <description>Generic error log attribute that allows logging error conditions within a dhcpService or a dhcpSubnet, like no IP addresses available for lease.</description>
+      <description>the distinguished name(s) of the dhcpHost objects.</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseIgnoreIA5Match</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+      <equality>distinguishedNameMatch</equality>
     </attributetype>
     <attributetype oid="2.16.840.1.113719.1.203.4.4" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
@@ -324,15 +315,6 @@
       <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
       <equality>caseIgnoreIA5Match</equality>
     </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
-      <aliases>
-        <alias>dhcpPermitList</alias>
-      </aliases>
-      <description>This attribute contains the permit lists associated with a pool. Each permit list is defined as a separate value.</description>
-      <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseIgnoreIA5Match</equality>
-    </attributetype>
     <attributetype oid="2.16.840.1.113719.1.203.4.6" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
         <alias>dhcpNetMask</alias>
@@ -342,73 +324,88 @@
       <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
       <equality>integerMatch</equality>
     </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.7" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.33" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpOption</alias>
+        <alias>dhcpRelayAgentInfo</alias>
       </aliases>
-      <description>Encoded option values to be sent to clients. Each value represents a single option and contains (OptionTag, Length, OptionValue) encoded in the format used by DHCP.</description>
+      <description>If the client request was received via a relay agent, this contains information about the relay agent that was available from the DHCP request. This is a hex-encoded option value.</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.40</syntax>
       <equality>caseIgnoreIA5Match</equality>
     </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.8" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.3" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpClassData</alias>
+        <alias>dhcpStatements</alias>
       </aliases>
-      <description>Encoded text string or list of bytes expressed in hexadecimal, separated by colons. Clients match subclasses based on matching the class data with the results of match or spawn with statements in the class name declarations.</description>
+      <description>Flexible storage for specific data depending on what object this exists in. Like conditional statements, server parameters, etc. This allows the standard to evolve without needing to adjust the schema.</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
       <equality>caseIgnoreIA5Match</equality>
     </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.9" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.21" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpOptionsDN</alias>
+        <alias>dhcpImplementation</alias>
       </aliases>
-      <description>The distinguished name(s) of the dhcpOption objects containing the configuration options provided by the server.</description>
+      <description>Description of the DHCP Server implementation e.g. DHCP Servers vendor.</description>
+      <usage>USER_APPLICATIONS</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+      <equality>caseIgnoreIA5Match</equality>
+    </attributetype>
+    <attributetype oid="2.16.840.1.113719.1.203.4.14" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+      <aliases>
+        <alias>dhcpLeaseDN</alias>
+      </aliases>
+      <description>The distinguished name of a client address.</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
       <equality>distinguishedNameMatch</equality>
     </attributetype>
+    <attributetype oid="2.16.840.1.113719.1.203.4.27" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+      <aliases>
+        <alias>dhcpDomainName</alias>
+      </aliases>
+      <description>This is the name of the domain sent to the client by the server. It is essentially the same as the value for DHCP option 15 sent to the client, and represents only the domain - not the full FQDN. To obtain the full FQDN assigned to the client you must prepend the "dhcpAssignedHostName" to this value with a ".".</description>
+      <usage>USER_APPLICATIONS</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+      <equality>caseIgnoreIA5Match</equality>
+    </attributetype>
   </attributetypes>
   <objectclasses>
-    <objectclass oid="2.16.840.1.113719.1.203.6.1" obsolete="false">
+    <objectclass oid="2.16.840.1.113719.1.203.6.4" obsolete="false">
       <aliases>
-        <alias>dhcpService</alias>
+        <alias>dhcpPool</alias>
       </aliases>
-      <description>Service object that represents the actual DHCP Service configuration. This is a container object.</description>
+      <description>This stores configuration information about a pool.</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
         <attributetype>cn</attributetype>
-        <attributetype>dhcpPrimaryDN</attributetype>
+        <attributetype>dhcpRange</attributetype>
       </mandatory>
       <optional>
-        <attributetype>dhcpSecondaryDN</attributetype>
-        <attributetype>dhcpSharedNetworkDN</attributetype>
-        <attributetype>dhcpSubnetDN</attributetype>
-        <attributetype>dhcpGroupDN</attributetype>
-        <attributetype>dhcpHostDN</attributetype>
         <attributetype>dhcpClassesDN</attributetype>
+        <attributetype>dhcpPermitList</attributetype>
+        <attributetype>dhcpLeasesDN</attributetype>
         <attributetype>dhcpOptionsDN</attributetype>
         <attributetype>dhcpStatements</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="2.16.840.1.113719.1.203.6.10" obsolete="false">
+    <objectclass oid="2.16.840.1.113719.1.203.6.11" obsolete="false">
       <aliases>
-        <alias>dhcpLeases</alias>
+        <alias>dhcpLog</alias>
       </aliases>
-      <description>This class represents an IP Address, which may or may not have been leased.</description>
+      <description>This is the object that holds past information about the IP address. The cn is the time/date stamp when the address was assigned or released, the address state at the time, if the address was assigned or released.</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
         <attributetype>cn</attributetype>
-        <attributetype>dhcpAddressState</attributetype>
       </mandatory>
       <optional>
+        <attributetype>dhcpAddressState</attributetype>
         <attributetype>dhcpExpirationTime</attributetype>
         <attributetype>dhcpStartTimeOfState</attributetype>
         <attributetype>dhcpLastTransactionTime</attributetype>
@@ -421,65 +418,49 @@
         <attributetype>dhcpAssignedToClient</attributetype>
         <attributetype>dhcpRelayAgentInfo</attributetype>
         <attributetype>dhcpHWAddress</attributetype>
+        <attributetype>dhcpErrorLog</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="2.16.840.1.113719.1.203.6.11" obsolete="false">
+    <objectclass oid="2.16.840.1.113719.1.203.6.9" obsolete="false">
       <aliases>
-        <alias>dhcpLog</alias>
+        <alias>dhcpOptions</alias>
       </aliases>
-      <description>This is the object that holds past information about the IP address. The cn is the time/date stamp when the address was assigned or released, the address state at the time, if the address was assigned or released.</description>
+      <description>Represents information about a collection of options defined.</description>
       <superiors>
         <superior>top</superior>
       </superiors>
-      <type>STRUCTURAL</type>
+      <type>AUXILIARY</type>
       <mandatory>
         <attributetype>cn</attributetype>
       </mandatory>
       <optional>
-        <attributetype>dhcpAddressState</attributetype>
-        <attributetype>dhcpExpirationTime</attributetype>
-        <attributetype>dhcpStartTimeOfState</attributetype>
-        <attributetype>dhcpLastTransactionTime</attributetype>
-        <attributetype>dhcpBootpFlag</attributetype>
-        <attributetype>dhcpDomainName</attributetype>
-        <attributetype>dhcpDnsStatus</attributetype>
-        <attributetype>dhcpRequestedHostName</attributetype>
-        <attributetype>dhcpAssignedHostName</attributetype>
-        <attributetype>dhcpReservedForClient</attributetype>
-        <attributetype>dhcpAssignedToClient</attributetype>
-        <attributetype>dhcpRelayAgentInfo</attributetype>
-        <attributetype>dhcpHWAddress</attributetype>
-        <attributetype>dhcpErrorLog</attributetype>
+        <attributetype>dhcpOption</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="2.16.840.1.113719.1.203.6.12" obsolete="false">
+    <objectclass oid="2.16.840.1.113719.1.203.6.2" obsolete="false">
       <aliases>
-        <alias>dhcpServer</alias>
+        <alias>dhcpSharedNetwork</alias>
       </aliases>
-      <description>DHCP Server Object</description>
+      <description>This stores configuration information for a shared network.</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
         <attributetype>cn</attributetype>
-        <attributetype>dhcpServiceDN</attributetype>
       </mandatory>
       <optional>
-        <attributetype>dhcpVersion</attributetype>
-        <attributetype>dhcpImplementation</attributetype>
-        <attributetype>dhcpHashBucketAssignment</attributetype>
-        <attributetype>dhcpDelayedServiceParameter</attributetype>
-        <attributetype>dhcpMaxClientLeadTime</attributetype>
-        <attributetype>dhcpFailOverEndpointState</attributetype>
+        <attributetype>dhcpSubnetDN</attributetype>
+        <attributetype>dhcpPoolDN</attributetype>
+        <attributetype>dhcpOptionsDN</attributetype>
         <attributetype>dhcpStatements</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="2.16.840.1.113719.1.203.6.2" obsolete="false">
+    <objectclass oid="2.16.840.1.113719.1.203.6.8" obsolete="false">
       <aliases>
-        <alias>dhcpSharedNetwork</alias>
+        <alias>dhcpSubClass</alias>
       </aliases>
-      <description>This stores configuration information for a shared network.</description>
+      <description>Represents information about a collection of related classes.</description>
       <superiors>
         <superior>top</superior>
       </superiors>
@@ -488,55 +469,60 @@
         <attributetype>cn</attributetype>
       </mandatory>
       <optional>
-        <attributetype>dhcpSubnetDN</attributetype>
-        <attributetype>dhcpPoolDN</attributetype>
+        <attributetype>dhcpClassData</attributetype>
         <attributetype>dhcpOptionsDN</attributetype>
         <attributetype>dhcpStatements</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="2.16.840.1.113719.1.203.6.3" obsolete="false">
+    <objectclass oid="2.16.840.1.113719.1.203.6.12" obsolete="false">
       <aliases>
-        <alias>dhcpSubnet</alias>
+        <alias>dhcpServer</alias>
       </aliases>
-      <description>This class defines a subnet. This is a container object.</description>
+      <description>DHCP Server Object</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
         <attributetype>cn</attributetype>
-        <attributetype>dhcpNetMask</attributetype>
+        <attributetype>dhcpServiceDN</attributetype>
       </mandatory>
       <optional>
-        <attributetype>dhcpRange</attributetype>
-        <attributetype>dhcpPoolDN</attributetype>
-        <attributetype>dhcpGroupDN</attributetype>
-        <attributetype>dhcpHostDN</attributetype>
-        <attributetype>dhcpClassesDN</attributetype>
-        <attributetype>dhcpLeasesDN</attributetype>
-        <attributetype>dhcpOptionsDN</attributetype>
+        <attributetype>dhcpVersion</attributetype>
+        <attributetype>dhcpImplementation</attributetype>
+        <attributetype>dhcpHashBucketAssignment</attributetype>
+        <attributetype>dhcpDelayedServiceParameter</attributetype>
+        <attributetype>dhcpMaxClientLeadTime</attributetype>
+        <attributetype>dhcpFailOverEndpointState</attributetype>
         <attributetype>dhcpStatements</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="2.16.840.1.113719.1.203.6.4" obsolete="false">
+    <objectclass oid="2.16.840.1.113719.1.203.6.10" obsolete="false">
       <aliases>
-        <alias>dhcpPool</alias>
+        <alias>dhcpLeases</alias>
       </aliases>
-      <description>This stores configuration information about a pool.</description>
+      <description>This class represents an IP Address, which may or may not have been leased.</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
         <attributetype>cn</attributetype>
-        <attributetype>dhcpRange</attributetype>
+        <attributetype>dhcpAddressState</attributetype>
       </mandatory>
       <optional>
-        <attributetype>dhcpClassesDN</attributetype>
-        <attributetype>dhcpPermitList</attributetype>
-        <attributetype>dhcpLeasesDN</attributetype>
-        <attributetype>dhcpOptionsDN</attributetype>
-        <attributetype>dhcpStatements</attributetype>
+        <attributetype>dhcpExpirationTime</attributetype>
+        <attributetype>dhcpStartTimeOfState</attributetype>
+        <attributetype>dhcpLastTransactionTime</attributetype>
+        <attributetype>dhcpBootpFlag</attributetype>
+        <attributetype>dhcpDomainName</attributetype>
+        <attributetype>dhcpDnsStatus</attributetype>
+        <attributetype>dhcpRequestedHostName</attributetype>
+        <attributetype>dhcpAssignedHostName</attributetype>
+        <attributetype>dhcpReservedForClient</attributetype>
+        <attributetype>dhcpAssignedToClient</attributetype>
+        <attributetype>dhcpRelayAgentInfo</attributetype>
+        <attributetype>dhcpHWAddress</attributetype>
       </optional>
     </objectclass>
     <objectclass oid="2.16.840.1.113719.1.203.6.5" obsolete="false">
@@ -557,21 +543,26 @@
         <attributetype>dhcpStatements</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="2.16.840.1.113719.1.203.6.6" obsolete="false">
+    <objectclass oid="2.16.840.1.113719.1.203.6.1" obsolete="false">
       <aliases>
-        <alias>dhcpHost</alias>
+        <alias>dhcpService</alias>
       </aliases>
-      <description>This represents information about a particular client</description>
+      <description>Service object that represents the actual DHCP Service configuration. This is a container object.</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
         <attributetype>cn</attributetype>
+        <attributetype>dhcpPrimaryDN</attributetype>
       </mandatory>
       <optional>
-        <attributetype>dhcpLeaseDN</attributetype>
-        <attributetype>dhcpHWAddress</attributetype>
+        <attributetype>dhcpSecondaryDN</attributetype>
+        <attributetype>dhcpSharedNetworkDN</attributetype>
+        <attributetype>dhcpSubnetDN</attributetype>
+        <attributetype>dhcpGroupDN</attributetype>
+        <attributetype>dhcpHostDN</attributetype>
+        <attributetype>dhcpClassesDN</attributetype>
         <attributetype>dhcpOptionsDN</attributetype>
         <attributetype>dhcpStatements</attributetype>
       </optional>
@@ -594,38 +585,47 @@
         <attributetype>dhcpStatements</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="2.16.840.1.113719.1.203.6.8" obsolete="false">
+    <objectclass oid="2.16.840.1.113719.1.203.6.3" obsolete="false">
       <aliases>
-        <alias>dhcpSubClass</alias>
+        <alias>dhcpSubnet</alias>
       </aliases>
-      <description>Represents information about a collection of related classes.</description>
+      <description>This class defines a subnet. This is a container object.</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
         <attributetype>cn</attributetype>
+        <attributetype>dhcpNetMask</attributetype>
       </mandatory>
       <optional>
-        <attributetype>dhcpClassData</attributetype>
+        <attributetype>dhcpRange</attributetype>
+        <attributetype>dhcpPoolDN</attributetype>
+        <attributetype>dhcpGroupDN</attributetype>
+        <attributetype>dhcpHostDN</attributetype>
+        <attributetype>dhcpClassesDN</attributetype>
+        <attributetype>dhcpLeasesDN</attributetype>
         <attributetype>dhcpOptionsDN</attributetype>
         <attributetype>dhcpStatements</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="2.16.840.1.113719.1.203.6.9" obsolete="false">
+    <objectclass oid="2.16.840.1.113719.1.203.6.6" obsolete="false">
       <aliases>
-        <alias>dhcpOptions</alias>
+        <alias>dhcpHost</alias>
       </aliases>
-      <description>Represents information about a collection of options defined.</description>
+      <description>This represents information about a particular client</description>
       <superiors>
         <superior>top</superior>
       </superiors>
-      <type>AUXILIARY</type>
+      <type>STRUCTURAL</type>
       <mandatory>
         <attributetype>cn</attributetype>
       </mandatory>
       <optional>
-        <attributetype>dhcpOption</attributetype>
+        <attributetype>dhcpLeaseDN</attributetype>
+        <attributetype>dhcpHWAddress</attributetype>
+        <attributetype>dhcpOptionsDN</attributetype>
+        <attributetype>dhcpStatements</attributetype>
       </optional>
     </objectclass>
   </objectclasses>



Mime
View raw message