You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2011/12/14 16:20:42 UTC

svn commit: r1214294 [5/9] - in /directory/studio/trunk/plugins/schemaeditor: resources/schemas/apacheds/ src/main/java/org/apache/directory/studio/schemaeditor/view/widget/

Modified: directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/core.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/core.xml?rev=1214294&r1=1214293&r2=1214294&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/core.xml (original)
+++ directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/core.xml Wed Dec 14 15:20:41 2011
@@ -19,13 +19,16 @@
 -->
 <schema name="core">
   <attributetypes>
-    <attributetype oid="2.5.4.52" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.1" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>supportedAlgorithms</alias>
+        <alias>uid</alias>
+        <alias>userid</alias>
       </aliases>
-      <description>RFC2256: supported algorithms</description>
+      <description>RFC1274: user identifier</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.49</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.25" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
@@ -38,100 +41,79 @@
       <equality>caseIgnoreIA5Match</equality>
       <substring>caseIgnoreIA5SubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="2.5.4.53" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.3" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>deltaRevocationList</alias>
+        <alias>mail</alias>
+        <alias>rfc822Mailbox</alias>
       </aliases>
-      <description>RFC2256: delta revocation list; use ;binary</description>
+      <description>RFC1274: RFC822 Mailbox</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.9</syntax>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+      <equality>caseIgnoreIA5Match</equality>
+      <substring>caseIgnoreIA5SubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="2.5.4.44" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="0.9.2342.19200300.100.1.37" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>generationQualifier</alias>
+        <alias>associatedDomain</alias>
       </aliases>
-      <description>RFC2256: name qualifier indicating a generation</description>
-      <superior>name</superior>
+      <description>RFC1274: domain associated with object</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>
+      <substring>caseIgnoreIA5SubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="2.5.4.36" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.2.840.113549.1.9.1" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>userCertificate</alias>
+        <alias>email</alias>
+        <alias>emailAddress</alias>
+        <alias>pkcs9email</alias>
       </aliases>
-      <description>RFC2256: X.509 user certificate, use ;binary</description>
+      <description>RFC2459: legacy attribute for email addresses in DNs</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.8</syntax>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+      <equality>caseIgnoreIA5Match</equality>
+      <substring>caseIgnoreIA5SubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="2.5.4.15" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.10" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>businessCategory</alias>
+        <alias>o</alias>
+        <alias>organizationName</alias>
       </aliases>
-      <description>RFC2256: business category</description>
+      <description>RFC2256: organization this object belongs to</description>
+      <superior>name</superior>
       <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="2.5.4.29" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
-      <aliases>
-        <alias>presentationAddress</alias>
-      </aliases>
-      <description>RFC2256: presentation address</description>
-      <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.43</syntax>
-      <equality>presentationAddressMatch</equality>
-    </attributetype>
-    <attributetype oid="2.5.4.6" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.11" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>c</alias>
-        <alias>countryName</alias>
+        <alias>ou</alias>
+        <alias>organizationalUnitName</alias>
       </aliases>
-      <description>RFC2256: ISO-3166 country 2-letter code</description>
+      <description>RFC2256: organizational unit this object belongs to</description>
       <superior>name</superior>
       <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.3" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
-      <aliases>
-        <alias>mail</alias>
-        <alias>rfc822Mailbox</alias>
-      </aliases>
-      <description>RFC1274: RFC822 Mailbox</description>
-      <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseIgnoreIA5Match</equality>
-      <substring>caseIgnoreIA5SubstringsMatch</substring>
-    </attributetype>
-    <attributetype oid="2.5.4.50" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
-      <aliases>
-        <alias>uniqueMember</alias>
-      </aliases>
-      <description>RFC2256: unique member of a group</description>
-      <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.34</syntax>
-      <equality>uniqueMemberMatch</equality>
-    </attributetype>
-    <attributetype oid="2.5.4.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.12" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>serialNumber</alias>
+        <alias>title</alias>
       </aliases>
-      <description>RFC2256: serial number of the entity</description>
+      <description>RFC2256: title associated with the entity</description>
+      <superior>name</superior>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
       <equality>caseIgnoreMatch</equality>
       <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="2.5.4.43" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.13" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>initials</alias>
+        <alias>description</alias>
       </aliases>
-      <description>RFC2256: initials of some or all of names, but not the surname(s).</description>
-      <superior>name</superior>
+      <description>RFC2256: descriptive information</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
       <equality>caseIgnoreMatch</equality>
@@ -145,87 +127,64 @@
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.25</syntax>
     </attributetype>
-    <attributetype oid="1.2.840.113549.1.9.1" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
-      <aliases>
-        <alias>email</alias>
-        <alias>emailAddress</alias>
-        <alias>pkcs9email</alias>
-      </aliases>
-      <description>RFC2459: legacy attribute for email addresses in DNs</description>
-      <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseIgnoreIA5Match</equality>
-      <substring>caseIgnoreIA5SubstringsMatch</substring>
-    </attributetype>
-    <attributetype oid="2.5.4.37" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.15" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>cACertificate</alias>
+        <alias>businessCategory</alias>
       </aliases>
-      <description>RFC2256: X.509 CA certificate, use ;binary</description>
+      <description>RFC2256: business category</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.8</syntax>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+      <equality>caseIgnoreMatch</equality>
+      <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="2.5.4.34" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.16" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>seeAlso</alias>
+        <alias>postalAddress</alias>
       </aliases>
-      <description>RFC2256: DN of related object</description>
-      <superior>distinguishedName</superior>
+      <description>RFC2256: postal address</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.41</syntax>
+      <equality>caseIgnoreListMatch</equality>
+      <substring>caseIgnoreListSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="2.5.4.42" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.17" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>givenName</alias>
-        <alias>gn</alias>
+        <alias>postalCode</alias>
       </aliases>
-      <description>RFC2256: first name(s) for which the entity is known by</description>
-      <superior>name</superior>
+      <description>RFC2256: postal code</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="2.5.4.51" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.18" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>houseIdentifier</alias>
+        <alias>postOfficeBox</alias>
       </aliases>
-      <description>RFC2256: house identifier</description>
+      <description>RFC2256: Post Office Box</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="2.5.4.13" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.19" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>description</alias>
+        <alias>physicalDeliveryOfficeName</alias>
       </aliases>
-      <description>RFC2256: descriptive information</description>
+      <description>RFC2256: Physical Delivery Office 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="2.5.4.28" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
-      <aliases>
-        <alias>preferredDeliveryMethod</alias>
-      </aliases>
-      <description>RFC2256: preferred delivery method</description>
-      <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.14</syntax>
-    </attributetype>
-    <attributetype oid="2.5.4.4" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.2" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>sn</alias>
-        <alias>surname</alias>
+        <alias>knowledgeInformation</alias>
       </aliases>
-      <description>RFC2256: last (family) name(s) for which the entity is known by</description>
-      <superior>name</superior>
+      <description>RFC2256: knowledge information</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="2.5.4.20" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
@@ -245,6 +204,54 @@
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.52</syntax>
     </attributetype>
+    <attributetype oid="2.5.4.22" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+      <aliases>
+        <alias>teletexTerminalIdentifier</alias>
+      </aliases>
+      <description>RFC2256: Teletex Terminal Identifier</description>
+      <usage>USER_APPLICATIONS</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.51</syntax>
+    </attributetype>
+    <attributetype oid="2.5.4.23" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+      <aliases>
+        <alias>facsimileTelephoneNumber</alias>
+        <alias>fax</alias>
+      </aliases>
+      <description>RFC2256: Facsimile (Fax) Telephone Number</description>
+      <usage>USER_APPLICATIONS</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.22</syntax>
+    </attributetype>
+    <attributetype oid="2.5.4.24" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+      <aliases>
+        <alias>x121Address</alias>
+      </aliases>
+      <description>RFC2256: X.121 Address</description>
+      <usage>USER_APPLICATIONS</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.36</syntax>
+      <equality>numericStringMatch</equality>
+      <substring>numericStringSubstringsMatch</substring>
+    </attributetype>
+    <attributetype oid="2.5.4.25" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+      <aliases>
+        <alias>internationaliSDNNumber</alias>
+      </aliases>
+      <description>RFC2256: international ISDN number</description>
+      <usage>USER_APPLICATIONS</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.36</syntax>
+      <equality>numericStringMatch</equality>
+      <substring>numericStringSubstringsMatch</substring>
+    </attributetype>
+    <attributetype oid="2.5.4.26" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+      <aliases>
+        <alias>registeredAddress</alias>
+      </aliases>
+      <description>RFC2256: registered postal address</description>
+      <superior>postalAddress</superior>
+      <usage>USER_APPLICATIONS</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.41</syntax>
+      <equality>caseIgnoreListMatch</equality>
+      <substring>caseIgnoreListSubstringsMatch</substring>
+    </attributetype>
     <attributetype oid="2.5.4.27" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
         <alias>destinationIndicator</alias>
@@ -255,266 +262,274 @@
       <equality>caseIgnoreMatch</equality>
       <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="2.5.4.12" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.28" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>title</alias>
+        <alias>preferredDeliveryMethod</alias>
       </aliases>
-      <description>RFC2256: title associated with the entity</description>
-      <superior>name</superior>
+      <description>RFC2256: preferred delivery method</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.14</syntax>
     </attributetype>
-    <attributetype oid="2.5.4.47" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.29" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>enhancedSearchGuide</alias>
+        <alias>presentationAddress</alias>
       </aliases>
-      <description>RFC2256: enhanced search guide</description>
+      <description>RFC2256: presentation address</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.21</syntax>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.43</syntax>
+      <equality>presentationAddressMatch</equality>
     </attributetype>
-    <attributetype oid="2.5.4.32" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.30" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>owner</alias>
+        <alias>supportedApplicationContext</alias>
       </aliases>
-      <description>RFC2256: owner (of the object)</description>
+      <description>RFC2256: supported application context</description>
+      <usage>USER_APPLICATIONS</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
+      <equality>objectIdentifierMatch</equality>
+    </attributetype>
+    <attributetype oid="2.5.4.31" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+      <aliases>
+        <alias>member</alias>
+      </aliases>
+      <description>RFC2256: member of a group</description>
       <superior>distinguishedName</superior>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
       <equality>distinguishedNameMatch</equality>
     </attributetype>
-    <attributetype oid="2.5.4.40" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.32" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>crossCertificatePair</alias>
+        <alias>owner</alias>
       </aliases>
-      <description>RFC2256: X.509 cross certificate pair, use ;binary</description>
+      <description>RFC2256: owner (of the object)</description>
+      <superior>distinguishedName</superior>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.10</syntax>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+      <equality>distinguishedNameMatch</equality>
     </attributetype>
-    <attributetype oid="2.5.4.22" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.33" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>teletexTerminalIdentifier</alias>
+        <alias>roleOccupant</alias>
       </aliases>
-      <description>RFC2256: Teletex Terminal Identifier</description>
+      <description>RFC2256: occupant of role</description>
+      <superior>distinguishedName</superior>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.51</syntax>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+      <equality>distinguishedNameMatch</equality>
     </attributetype>
-    <attributetype oid="2.5.4.2" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.34" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>knowledgeInformation</alias>
+        <alias>seeAlso</alias>
       </aliases>
-      <description>RFC2256: knowledge information</description>
+      <description>RFC2256: DN of related object</description>
+      <superior>distinguishedName</superior>
       <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.12</syntax>
+      <equality>distinguishedNameMatch</equality>
     </attributetype>
-    <attributetype oid="2.5.4.9" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.36" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>street</alias>
-        <alias>streetAddress</alias>
+        <alias>userCertificate</alias>
       </aliases>
-      <description>RFC2256: street address of this object</description>
+      <description>RFC2256: X.509 user certificate, use ;binary</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.8</syntax>
     </attributetype>
-    <attributetype oid="2.5.4.26" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.37" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>registeredAddress</alias>
+        <alias>cACertificate</alias>
       </aliases>
-      <description>RFC2256: registered postal address</description>
-      <superior>postalAddress</superior>
+      <description>RFC2256: X.509 CA certificate, use ;binary</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.8</syntax>
     </attributetype>
-    <attributetype oid="2.5.4.11" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.38" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>ou</alias>
-        <alias>organizationalUnitName</alias>
+        <alias>authorityRevocationList</alias>
       </aliases>
-      <description>RFC2256: organizational unit this object belongs to</description>
-      <superior>name</superior>
+      <description>RFC2256: X.509 authority revocation list, use ;binary</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.9</syntax>
     </attributetype>
-    <attributetype oid="2.5.4.23" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.39" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>facsimileTelephoneNumber</alias>
-        <alias>fax</alias>
+        <alias>certificateRevocationList</alias>
       </aliases>
-      <description>RFC2256: Facsimile (Fax) Telephone Number</description>
+      <description>RFC2256: X.509 certificate revocation list, use ;binary</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.22</syntax>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.9</syntax>
     </attributetype>
-    <attributetype oid="2.5.4.48" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.4" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>protocolInformation</alias>
+        <alias>sn</alias>
+        <alias>surname</alias>
       </aliases>
-      <description>RFC2256: protocol information</description>
+      <description>RFC2256: last (family) name(s) for which the entity is known by</description>
+      <superior>name</superior>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.42</syntax>
-      <equality>protocolInformationMatch</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+      <equality>caseIgnoreMatch</equality>
+      <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="2.5.4.25" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.40" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>internationaliSDNNumber</alias>
+        <alias>crossCertificatePair</alias>
       </aliases>
-      <description>RFC2256: international ISDN number</description>
+      <description>RFC2256: X.509 cross certificate pair, use ;binary</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.36</syntax>
-      <equality>numericStringMatch</equality>
-      <substring>numericStringSubstringsMatch</substring>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.10</syntax>
     </attributetype>
-    <attributetype oid="2.5.4.19" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.42" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>physicalDeliveryOfficeName</alias>
+        <alias>givenName</alias>
+        <alias>gn</alias>
       </aliases>
-      <description>RFC2256: Physical Delivery Office Name</description>
+      <description>RFC2256: first name(s) for which the entity is known by</description>
+      <superior>name</superior>
       <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.37" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.43" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>associatedDomain</alias>
+        <alias>initials</alias>
       </aliases>
-      <description>RFC1274: domain associated with object</description>
+      <description>RFC2256: initials of some or all of names, but not the surname(s).</description>
+      <superior>name</superior>
       <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.15</syntax>
+      <equality>caseIgnoreMatch</equality>
+      <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="2.5.4.54" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.44" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>dmdName</alias>
+        <alias>generationQualifier</alias>
       </aliases>
-      <description>RFC2256: name of DMD</description>
+      <description>RFC2256: name qualifier indicating a generation</description>
       <superior>name</superior>
       <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="2.5.4.33" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.45" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>roleOccupant</alias>
+        <alias>x500UniqueIdentifier</alias>
       </aliases>
-      <description>RFC2256: occupant of role</description>
-      <superior>distinguishedName</superior>
+      <description>RFC2256: X.500 unique identifier</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.6</syntax>
+      <equality>bitStringMatch</equality>
     </attributetype>
-    <attributetype oid="2.5.4.10" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.46" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>o</alias>
-        <alias>organizationName</alias>
+        <alias>dnQualifier</alias>
       </aliases>
-      <description>RFC2256: organization this object belongs to</description>
-      <superior>name</superior>
+      <description>RFC2256: DN qualifier</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
       <equality>caseIgnoreMatch</equality>
+      <ordering>caseIgnoreOrderingMatch</ordering>
       <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="2.5.4.17" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.47" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>postalCode</alias>
+        <alias>enhancedSearchGuide</alias>
       </aliases>
-      <description>RFC2256: postal code</description>
+      <description>RFC2256: enhanced search guide</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.21</syntax>
     </attributetype>
-    <attributetype oid="0.9.2342.19200300.100.1.1" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.48" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>uid</alias>
-        <alias>userid</alias>
+        <alias>protocolInformation</alias>
       </aliases>
-      <description>RFC1274: user identifier</description>
+      <description>RFC2256: protocol information</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.42</syntax>
+      <equality>protocolInformationMatch</equality>
     </attributetype>
-    <attributetype oid="2.5.4.31" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>member</alias>
+        <alias>serialNumber</alias>
       </aliases>
-      <description>RFC2256: member of a group</description>
-      <superior>distinguishedName</superior>
+      <description>RFC2256: serial number of the entity</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.44</syntax>
+      <equality>caseIgnoreMatch</equality>
+      <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="2.5.4.24" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.50" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>x121Address</alias>
+        <alias>uniqueMember</alias>
       </aliases>
-      <description>RFC2256: X.121 Address</description>
+      <description>RFC2256: unique member of a group</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.36</syntax>
-      <equality>numericStringMatch</equality>
-      <substring>numericStringSubstringsMatch</substring>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.34</syntax>
+      <equality>uniqueMemberMatch</equality>
     </attributetype>
-    <attributetype oid="2.5.4.7" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.51" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>l</alias>
-        <alias>localityName</alias>
+        <alias>houseIdentifier</alias>
       </aliases>
-      <description>RFC2256: locality which this object resides in</description>
-      <superior>name</superior>
+      <description>RFC2256: house identifier</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="2.5.4.38" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.52" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+      <aliases>
+        <alias>supportedAlgorithms</alias>
+      </aliases>
+      <description>RFC2256: supported algorithms</description>
+      <usage>USER_APPLICATIONS</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.49</syntax>
+    </attributetype>
+    <attributetype oid="2.5.4.53" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>authorityRevocationList</alias>
+        <alias>deltaRevocationList</alias>
       </aliases>
-      <description>RFC2256: X.509 authority revocation list, use ;binary</description>
+      <description>RFC2256: delta revocation list; use ;binary</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.9</syntax>
     </attributetype>
-    <attributetype oid="2.5.4.18" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.54" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>postOfficeBox</alias>
+        <alias>dmdName</alias>
       </aliases>
-      <description>RFC2256: Post Office Box</description>
+      <description>RFC2256: name of DMD</description>
+      <superior>name</superior>
       <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="2.5.4.46" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.6" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>dnQualifier</alias>
+        <alias>c</alias>
+        <alias>countryName</alias>
       </aliases>
-      <description>RFC2256: DN qualifier</description>
+      <description>RFC2256: ISO-3166 country 2-letter code</description>
+      <superior>name</superior>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
       <equality>caseIgnoreMatch</equality>
-      <ordering>caseIgnoreOrderingMatch</ordering>
       <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="2.5.4.16" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.7" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>postalAddress</alias>
+        <alias>l</alias>
+        <alias>localityName</alias>
       </aliases>
-      <description>RFC2256: postal address</description>
+      <description>RFC2256: locality which this object resides in</description>
+      <superior>name</superior>
       <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.15</syntax>
+      <equality>caseIgnoreMatch</equality>
+      <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
     <attributetype oid="2.5.4.8" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
@@ -528,106 +543,57 @@
       <equality>caseIgnoreMatch</equality>
       <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="2.5.4.39" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
-      <aliases>
-        <alias>certificateRevocationList</alias>
-      </aliases>
-      <description>RFC2256: X.509 certificate revocation list, use ;binary</description>
-      <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.9</syntax>
-    </attributetype>
-    <attributetype oid="2.5.4.45" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
-      <aliases>
-        <alias>x500UniqueIdentifier</alias>
-      </aliases>
-      <description>RFC2256: X.500 unique identifier</description>
-      <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.6</syntax>
-      <equality>bitStringMatch</equality>
-    </attributetype>
-    <attributetype oid="2.5.4.30" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.9" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>supportedApplicationContext</alias>
+        <alias>street</alias>
+        <alias>streetAddress</alias>
       </aliases>
-      <description>RFC2256: supported application context</description>
+      <description>RFC2256: street address of this object</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
-      <equality>objectIdentifierMatch</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+      <equality>caseIgnoreMatch</equality>
+      <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
   </attributetypes>
   <objectclasses>
-    <objectclass oid="2.5.6.14" obsolete="false">
+    <objectclass oid="0.9.2342.19200300.100.4.19" obsolete="false">
       <aliases>
-        <alias>device</alias>
+        <alias>simpleSecurityObject</alias>
       </aliases>
-      <description>RFC2256: a device</description>
+      <description>RFC1274: simple security object</description>
       <superiors>
         <superior>top</superior>
       </superiors>
-      <type>STRUCTURAL</type>
+      <type>AUXILIARY</type>
       <mandatory>
-        <attributetype>cn</attributetype>
+        <attributetype>userPassword</attributetype>
       </mandatory>
-      <optional>
-        <attributetype>serialNumber</attributetype>
-        <attributetype>seeAlso</attributetype>
-        <attributetype>owner</attributetype>
-        <attributetype>ou</attributetype>
-        <attributetype>o</attributetype>
-        <attributetype>l</attributetype>
-        <attributetype>description</attributetype>
-      </optional>
     </objectclass>
-    <objectclass oid="2.5.6.17" obsolete="false">
+    <objectclass oid="1.3.6.1.1.3.1" obsolete="false">
       <aliases>
-        <alias>groupOfUniqueNames</alias>
+        <alias>uidObject</alias>
       </aliases>
-      <description>RFC2256: a group of unique names (DN and Unique Identifier)</description>
+      <description>RFC2377: uid object</description>
       <superiors>
         <superior>top</superior>
       </superiors>
-      <type>STRUCTURAL</type>
+      <type>AUXILIARY</type>
       <mandatory>
-        <attributetype>uniqueMember</attributetype>
-        <attributetype>cn</attributetype>
+        <attributetype>uid</attributetype>
       </mandatory>
-      <optional>
-        <attributetype>businessCategory</attributetype>
-        <attributetype>seeAlso</attributetype>
-        <attributetype>owner</attributetype>
-        <attributetype>ou</attributetype>
-        <attributetype>o</attributetype>
-        <attributetype>description</attributetype>
-      </optional>
-    </objectclass>
-    <objectclass oid="2.5.6.22" obsolete="false">
-      <aliases>
-        <alias>pkiCA</alias>
-      </aliases>
-      <description>RFC2587: PKI certificate authority</description>
-      <superiors>
-        <superior>top</superior>
-      </superiors>
-      <type>AUXILIARY</type>
-      <optional>
-        <attributetype>authorityRevocationList</attributetype>
-        <attributetype>certificateRevocationList</attributetype>
-        <attributetype>cACertificate</attributetype>
-        <attributetype>crossCertificatePair</attributetype>
-      </optional>
     </objectclass>
-    <objectclass oid="2.5.6.21" obsolete="false">
+    <objectclass oid="1.3.6.1.4.1.1466.344" obsolete="false">
       <aliases>
-        <alias>pkiUser</alias>
+        <alias>dcObject</alias>
       </aliases>
-      <description>RFC2587: a PKI user</description>
+      <description>RFC2247: domain component object</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>AUXILIARY</type>
-      <optional>
-        <attributetype>userCertificate</attributetype>
-      </optional>
+      <mandatory>
+        <attributetype>dc</attributetype>
+      </mandatory>
     </objectclass>
     <objectclass oid="1.3.6.1.4.1.250.3.15" obsolete="false">
       <aliases>
@@ -642,17 +608,20 @@
         <attributetype>labeledURI</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="2.5.6.7" obsolete="false">
+    <objectclass oid="2.5.6.10" obsolete="false">
       <aliases>
-        <alias>organizationalPerson</alias>
+        <alias>residentialPerson</alias>
       </aliases>
-      <description>RFC2256: an organizational person</description>
+      <description>RFC2256: an residential person</description>
       <superiors>
         <superior>person</superior>
       </superiors>
       <type>STRUCTURAL</type>
+      <mandatory>
+        <attributetype>l</attributetype>
+      </mandatory>
       <optional>
-        <attributetype>title</attributetype>
+        <attributetype>businessCategory</attributetype>
         <attributetype>x121Address</attributetype>
         <attributetype>registeredAddress</attributetype>
         <attributetype>destinationIndicator</attributetype>
@@ -667,29 +636,14 @@
         <attributetype>postalCode</attributetype>
         <attributetype>postalAddress</attributetype>
         <attributetype>physicalDeliveryOfficeName</attributetype>
-        <attributetype>ou</attributetype>
         <attributetype>st</attributetype>
-        <attributetype>l</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="0.9.2342.19200300.100.4.19" obsolete="false">
-      <aliases>
-        <alias>simpleSecurityObject</alias>
-      </aliases>
-      <description>RFC1274: simple security object</description>
-      <superiors>
-        <superior>top</superior>
-      </superiors>
-      <type>AUXILIARY</type>
-      <mandatory>
-        <attributetype>userPassword</attributetype>
-      </mandatory>
-    </objectclass>
-    <objectclass oid="2.5.6.8" obsolete="false">
+    <objectclass oid="2.5.6.11" obsolete="false">
       <aliases>
-        <alias>organizationalRole</alias>
+        <alias>applicationProcess</alias>
       </aliases>
-      <description>RFC2256: an organizational role</description>
+      <description>RFC2256: an application process</description>
       <superiors>
         <superior>top</superior>
       </superiors>
@@ -698,112 +652,131 @@
         <attributetype>cn</attributetype>
       </mandatory>
       <optional>
-        <attributetype>x121Address</attributetype>
-        <attributetype>registeredAddress</attributetype>
-        <attributetype>destinationIndicator</attributetype>
-        <attributetype>preferredDeliveryMethod</attributetype>
-        <attributetype>telexNumber</attributetype>
-        <attributetype>teletexTerminalIdentifier</attributetype>
-        <attributetype>telephoneNumber</attributetype>
-        <attributetype>internationaliSDNNumber</attributetype>
-        <attributetype>facsimileTelephoneNumber</attributetype>
         <attributetype>seeAlso</attributetype>
-        <attributetype>roleOccupant</attributetype>
-        <attributetype>street</attributetype>
-        <attributetype>postOfficeBox</attributetype>
-        <attributetype>postalCode</attributetype>
-        <attributetype>postalAddress</attributetype>
-        <attributetype>physicalDeliveryOfficeName</attributetype>
         <attributetype>ou</attributetype>
-        <attributetype>st</attributetype>
         <attributetype>l</attributetype>
         <attributetype>description</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="2.5.6.15" obsolete="false">
+    <objectclass oid="2.5.6.12" obsolete="false">
       <aliases>
-        <alias>strongAuthenticationUser</alias>
+        <alias>applicationEntity</alias>
       </aliases>
-      <description>RFC2256: a strong authentication user</description>
+      <description>RFC2256: an application entity</description>
       <superiors>
         <superior>top</superior>
       </superiors>
-      <type>AUXILIARY</type>
+      <type>STRUCTURAL</type>
       <mandatory>
-        <attributetype>userCertificate</attributetype>
+        <attributetype>presentationAddress</attributetype>
+        <attributetype>cn</attributetype>
       </mandatory>
+      <optional>
+        <attributetype>supportedApplicationContext</attributetype>
+        <attributetype>seeAlso</attributetype>
+        <attributetype>ou</attributetype>
+        <attributetype>o</attributetype>
+        <attributetype>l</attributetype>
+        <attributetype>description</attributetype>
+      </optional>
     </objectclass>
-    <objectclass oid="2.5.6.23" obsolete="false">
+    <objectclass oid="2.5.6.13" obsolete="false">
       <aliases>
-        <alias>deltaCRL</alias>
+        <alias>dSA</alias>
       </aliases>
-      <description>RFC2587: PKI user</description>
+      <description>RFC2256: a directory system agent (a server)</description>
       <superiors>
-        <superior>top</superior>
+        <superior>applicationEntity</superior>
       </superiors>
-      <type>AUXILIARY</type>
+      <type>STRUCTURAL</type>
       <optional>
-        <attributetype>deltaRevocationList</attributetype>
+        <attributetype>knowledgeInformation</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="2.5.6.12" obsolete="false">
+    <objectclass oid="2.5.6.14" obsolete="false">
       <aliases>
-        <alias>applicationEntity</alias>
+        <alias>device</alias>
       </aliases>
-      <description>RFC2256: an application entity</description>
+      <description>RFC2256: a device</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
-        <attributetype>presentationAddress</attributetype>
         <attributetype>cn</attributetype>
       </mandatory>
       <optional>
-        <attributetype>supportedApplicationContext</attributetype>
+        <attributetype>serialNumber</attributetype>
         <attributetype>seeAlso</attributetype>
+        <attributetype>owner</attributetype>
         <attributetype>ou</attributetype>
         <attributetype>o</attributetype>
         <attributetype>l</attributetype>
         <attributetype>description</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="2.5.6.6" obsolete="false">
+    <objectclass oid="2.5.6.15" obsolete="false">
       <aliases>
-        <alias>person</alias>
+        <alias>strongAuthenticationUser</alias>
       </aliases>
-      <description>RFC2256: a person</description>
+      <description>RFC2256: a strong authentication user</description>
       <superiors>
         <superior>top</superior>
       </superiors>
-      <type>STRUCTURAL</type>
+      <type>AUXILIARY</type>
       <mandatory>
-        <attributetype>sn</attributetype>
-        <attributetype>cn</attributetype>
+        <attributetype>userCertificate</attributetype>
+      </mandatory>
+    </objectclass>
+    <objectclass oid="2.5.6.16.2" obsolete="false">
+      <aliases>
+        <alias>certificationAuthority-V2</alias>
+      </aliases>
+      <superiors>
+        <superior>certificationAuthority</superior>
+      </superiors>
+      <type>AUXILIARY</type>
+      <optional>
+        <attributetype>deltaRevocationList</attributetype>
+      </optional>
+    </objectclass>
+    <objectclass oid="2.5.6.16" obsolete="false">
+      <aliases>
+        <alias>certificationAuthority</alias>
+      </aliases>
+      <description>RFC2256: a certificate authority</description>
+      <superiors>
+        <superior>top</superior>
+      </superiors>
+      <type>AUXILIARY</type>
+      <mandatory>
+        <attributetype>authorityRevocationList</attributetype>
+        <attributetype>certificateRevocationList</attributetype>
+        <attributetype>cACertificate</attributetype>
       </mandatory>
       <optional>
-        <attributetype>userPassword</attributetype>
-        <attributetype>telephoneNumber</attributetype>
-        <attributetype>seeAlso</attributetype>
-        <attributetype>description</attributetype>
+        <attributetype>crossCertificatePair</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="2.5.6.11" obsolete="false">
+    <objectclass oid="2.5.6.17" obsolete="false">
       <aliases>
-        <alias>applicationProcess</alias>
+        <alias>groupOfUniqueNames</alias>
       </aliases>
-      <description>RFC2256: an application process</description>
+      <description>RFC2256: a group of unique names (DN and Unique Identifier)</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
+        <attributetype>uniqueMember</attributetype>
         <attributetype>cn</attributetype>
       </mandatory>
       <optional>
+        <attributetype>businessCategory</attributetype>
         <attributetype>seeAlso</attributetype>
+        <attributetype>owner</attributetype>
         <attributetype>ou</attributetype>
-        <attributetype>l</attributetype>
+        <attributetype>o</attributetype>
         <attributetype>description</attributetype>
       </optional>
     </objectclass>
@@ -820,68 +793,40 @@
         <attributetype>supportedAlgorithms</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="1.3.6.1.4.1.1466.344" obsolete="false">
+    <objectclass oid="2.5.6.19" obsolete="false">
       <aliases>
-        <alias>dcObject</alias>
+        <alias>cRLDistributionPoint</alias>
       </aliases>
-      <description>RFC2247: domain component object</description>
       <superiors>
         <superior>top</superior>
       </superiors>
-      <type>AUXILIARY</type>
+      <type>STRUCTURAL</type>
       <mandatory>
-        <attributetype>dc</attributetype>
+        <attributetype>cn</attributetype>
       </mandatory>
+      <optional>
+        <attributetype>certificateRevocationList</attributetype>
+        <attributetype>authorityRevocationList</attributetype>
+        <attributetype>deltaRevocationList</attributetype>
+      </optional>
     </objectclass>
-    <objectclass oid="2.5.6.5" obsolete="false">
+    <objectclass oid="2.5.6.2" obsolete="false">
       <aliases>
-        <alias>organizationalUnit</alias>
+        <alias>country</alias>
       </aliases>
-      <description>RFC2256: an organizational unit</description>
+      <description>RFC2256: a country</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
-        <attributetype>ou</attributetype>
+        <attributetype>c</attributetype>
       </mandatory>
       <optional>
-        <attributetype>userPassword</attributetype>
         <attributetype>searchGuide</attributetype>
-        <attributetype>seeAlso</attributetype>
-        <attributetype>businessCategory</attributetype>
-        <attributetype>x121Address</attributetype>
-        <attributetype>registeredAddress</attributetype>
-        <attributetype>destinationIndicator</attributetype>
-        <attributetype>preferredDeliveryMethod</attributetype>
-        <attributetype>telexNumber</attributetype>
-        <attributetype>teletexTerminalIdentifier</attributetype>
-        <attributetype>telephoneNumber</attributetype>
-        <attributetype>internationaliSDNNumber</attributetype>
-        <attributetype>facsimileTelephoneNumber</attributetype>
-        <attributetype>street</attributetype>
-        <attributetype>postOfficeBox</attributetype>
-        <attributetype>postalCode</attributetype>
-        <attributetype>postalAddress</attributetype>
-        <attributetype>physicalDeliveryOfficeName</attributetype>
-        <attributetype>st</attributetype>
-        <attributetype>l</attributetype>
         <attributetype>description</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="2.5.6.13" obsolete="false">
-      <aliases>
-        <alias>dSA</alias>
-      </aliases>
-      <description>RFC2256: a directory system agent (a server)</description>
-      <superiors>
-        <superior>applicationEntity</superior>
-      </superiors>
-      <type>STRUCTURAL</type>
-      <optional>
-        <attributetype>knowledgeInformation</attributetype>
-      </optional>
-    </objectclass>
     <objectclass oid="2.5.6.20" obsolete="false">
       <aliases>
         <alias>dmd</alias>
@@ -917,49 +862,82 @@
         <attributetype>description</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="1.3.6.1.1.3.1" obsolete="false">
+    <objectclass oid="2.5.6.21" obsolete="false">
       <aliases>
-        <alias>uidObject</alias>
+        <alias>pkiUser</alias>
       </aliases>
-      <description>RFC2377: uid object</description>
+      <description>RFC2587: a PKI user</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>AUXILIARY</type>
-      <mandatory>
-        <attributetype>uid</attributetype>
-      </mandatory>
+      <optional>
+        <attributetype>userCertificate</attributetype>
+      </optional>
     </objectclass>
-    <objectclass oid="2.5.6.19" obsolete="false">
+    <objectclass oid="2.5.6.22" obsolete="false">
       <aliases>
-        <alias>cRLDistributionPoint</alias>
+        <alias>pkiCA</alias>
       </aliases>
+      <description>RFC2587: PKI certificate authority</description>
       <superiors>
         <superior>top</superior>
       </superiors>
-      <type>STRUCTURAL</type>
-      <mandatory>
-        <attributetype>cn</attributetype>
-      </mandatory>
+      <type>AUXILIARY</type>
       <optional>
-        <attributetype>certificateRevocationList</attributetype>
         <attributetype>authorityRevocationList</attributetype>
+        <attributetype>certificateRevocationList</attributetype>
+        <attributetype>cACertificate</attributetype>
+        <attributetype>crossCertificatePair</attributetype>
+      </optional>
+    </objectclass>
+    <objectclass oid="2.5.6.23" obsolete="false">
+      <aliases>
+        <alias>deltaCRL</alias>
+      </aliases>
+      <description>RFC2587: PKI user</description>
+      <superiors>
+        <superior>top</superior>
+      </superiors>
+      <type>AUXILIARY</type>
+      <optional>
         <attributetype>deltaRevocationList</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="2.5.6.10" obsolete="false">
+    <objectclass oid="2.5.6.3" obsolete="false">
       <aliases>
-        <alias>residentialPerson</alias>
+        <alias>locality</alias>
       </aliases>
-      <description>RFC2256: an residential person</description>
+      <description>RFC2256: a locality</description>
       <superiors>
-        <superior>person</superior>
+        <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
-      <mandatory>
+      <optional>
+        <attributetype>searchGuide</attributetype>
+        <attributetype>description</attributetype>
+        <attributetype>street</attributetype>
+        <attributetype>seeAlso</attributetype>
+        <attributetype>st</attributetype>
         <attributetype>l</attributetype>
+      </optional>
+    </objectclass>
+    <objectclass oid="2.5.6.4" obsolete="false">
+      <aliases>
+        <alias>organization</alias>
+      </aliases>
+      <description>RFC2256: an organization</description>
+      <superiors>
+        <superior>top</superior>
+      </superiors>
+      <type>STRUCTURAL</type>
+      <mandatory>
+        <attributetype>o</attributetype>
       </mandatory>
       <optional>
+        <attributetype>userPassword</attributetype>
+        <attributetype>searchGuide</attributetype>
+        <attributetype>seeAlso</attributetype>
         <attributetype>businessCategory</attributetype>
         <attributetype>x121Address</attributetype>
         <attributetype>registeredAddress</attributetype>
@@ -976,37 +954,21 @@
         <attributetype>postalAddress</attributetype>
         <attributetype>physicalDeliveryOfficeName</attributetype>
         <attributetype>st</attributetype>
+        <attributetype>l</attributetype>
+        <attributetype>description</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="2.5.6.16" obsolete="false">
-      <aliases>
-        <alias>certificationAuthority</alias>
-      </aliases>
-      <description>RFC2256: a certificate authority</description>
-      <superiors>
-        <superior>top</superior>
-      </superiors>
-      <type>AUXILIARY</type>
-      <mandatory>
-        <attributetype>authorityRevocationList</attributetype>
-        <attributetype>certificateRevocationList</attributetype>
-        <attributetype>cACertificate</attributetype>
-      </mandatory>
-      <optional>
-        <attributetype>crossCertificatePair</attributetype>
-      </optional>
-    </objectclass>
-    <objectclass oid="2.5.6.4" obsolete="false">
+    <objectclass oid="2.5.6.5" obsolete="false">
       <aliases>
-        <alias>organization</alias>
+        <alias>organizationalUnit</alias>
       </aliases>
-      <description>RFC2256: an organization</description>
+      <description>RFC2256: an organizational unit</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
-        <attributetype>o</attributetype>
+        <attributetype>ou</attributetype>
       </mandatory>
       <optional>
         <attributetype>userPassword</attributetype>
@@ -1032,72 +994,110 @@
         <attributetype>description</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="2.5.6.3" obsolete="false">
+    <objectclass oid="2.5.6.6" obsolete="false">
       <aliases>
-        <alias>locality</alias>
+        <alias>person</alias>
       </aliases>
-      <description>RFC2256: a locality</description>
+      <description>RFC2256: a person</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
+      <mandatory>
+        <attributetype>sn</attributetype>
+        <attributetype>cn</attributetype>
+      </mandatory>
       <optional>
-        <attributetype>street</attributetype>
+        <attributetype>userPassword</attributetype>
+        <attributetype>telephoneNumber</attributetype>
         <attributetype>seeAlso</attributetype>
-        <attributetype>searchGuide</attributetype>
-        <attributetype>st</attributetype>
-        <attributetype>l</attributetype>
         <attributetype>description</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="2.5.6.16.2" obsolete="false">
+    <objectclass oid="2.5.6.7" obsolete="false">
       <aliases>
-        <alias>certificationAuthority-V2</alias>
+        <alias>organizationalPerson</alias>
       </aliases>
+      <description>RFC2256: an organizational person</description>
       <superiors>
-        <superior>certificationAuthority</superior>
+        <superior>person</superior>
       </superiors>
-      <type>AUXILIARY</type>
+      <type>STRUCTURAL</type>
       <optional>
-        <attributetype>deltaRevocationList</attributetype>
+        <attributetype>title</attributetype>
+        <attributetype>x121Address</attributetype>
+        <attributetype>registeredAddress</attributetype>
+        <attributetype>destinationIndicator</attributetype>
+        <attributetype>preferredDeliveryMethod</attributetype>
+        <attributetype>telexNumber</attributetype>
+        <attributetype>teletexTerminalIdentifier</attributetype>
+        <attributetype>telephoneNumber</attributetype>
+        <attributetype>internationaliSDNNumber</attributetype>
+        <attributetype>facsimileTelephoneNumber</attributetype>
+        <attributetype>street</attributetype>
+        <attributetype>postOfficeBox</attributetype>
+        <attributetype>postalCode</attributetype>
+        <attributetype>postalAddress</attributetype>
+        <attributetype>physicalDeliveryOfficeName</attributetype>
+        <attributetype>ou</attributetype>
+        <attributetype>st</attributetype>
+        <attributetype>l</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="2.5.6.9" obsolete="false">
+    <objectclass oid="2.5.6.8" obsolete="false">
       <aliases>
-        <alias>groupOfNames</alias>
+        <alias>organizationalRole</alias>
       </aliases>
-      <description>RFC2256: a group of names (DNs)</description>
+      <description>RFC2256: an organizational role</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
-        <attributetype>member</attributetype>
         <attributetype>cn</attributetype>
       </mandatory>
       <optional>
-        <attributetype>businessCategory</attributetype>
+        <attributetype>x121Address</attributetype>
+        <attributetype>registeredAddress</attributetype>
+        <attributetype>destinationIndicator</attributetype>
+        <attributetype>preferredDeliveryMethod</attributetype>
+        <attributetype>telexNumber</attributetype>
+        <attributetype>teletexTerminalIdentifier</attributetype>
+        <attributetype>telephoneNumber</attributetype>
+        <attributetype>internationaliSDNNumber</attributetype>
+        <attributetype>facsimileTelephoneNumber</attributetype>
         <attributetype>seeAlso</attributetype>
-        <attributetype>owner</attributetype>
+        <attributetype>roleOccupant</attributetype>
+        <attributetype>street</attributetype>
+        <attributetype>postOfficeBox</attributetype>
+        <attributetype>postalCode</attributetype>
+        <attributetype>postalAddress</attributetype>
+        <attributetype>physicalDeliveryOfficeName</attributetype>
         <attributetype>ou</attributetype>
-        <attributetype>o</attributetype>
+        <attributetype>st</attributetype>
+        <attributetype>l</attributetype>
         <attributetype>description</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="2.5.6.2" obsolete="false">
+    <objectclass oid="2.5.6.9" obsolete="false">
       <aliases>
-        <alias>country</alias>
+        <alias>groupOfNames</alias>
       </aliases>
-      <description>RFC2256: a country</description>
+      <description>RFC2256: a group of names (DNs)</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
-        <attributetype>c</attributetype>
+        <attributetype>cn</attributetype>
+        <attributetype>member</attributetype>
       </mandatory>
       <optional>
-        <attributetype>searchGuide</attributetype>
+        <attributetype>businessCategory</attributetype>
+        <attributetype>seeAlso</attributetype>
+        <attributetype>owner</attributetype>
+        <attributetype>ou</attributetype>
+        <attributetype>o</attributetype>
         <attributetype>description</attributetype>
       </optional>
     </objectclass>