directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1214294 [7/9] - in /directory/studio/trunk/plugins/schemaeditor: resources/schemas/apacheds/ src/main/java/org/apache/directory/studio/schemaeditor/view/widget/
Date Wed, 14 Dec 2011 15:20:42 GMT
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=1214294&r1=1214293&r2=1214294&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/dhcp.xml (original)
+++ directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/dhcp.xml Wed Dec 14 15:20:41 2011
@@ -19,68 +19,50 @@
 -->
 <schema name="dhcp">
   <attributetypes>
-    <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.1" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpLeasesDN</alias>
+        <alias>dhcpPrimaryDN</alias>
       </aliases>
-      <description>The distinguished name(s) client addresses.</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.12</syntax>
       <equality>distinguishedNameMatch</equality>
     </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.34" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
-      <aliases>
-        <alias>dhcpHWAddress</alias>
-      </aliases>
-      <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.40</syntax>
-      <equality>caseIgnoreIA5Match</equality>
-    </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.22" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
-      <aliases>
-        <alias>dhcpAddressState</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>
-      <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.21" 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>dhcpImplementation</alias>
+        <alias>dhcpHostDN</alias>
       </aliases>
-      <description>Description of the DHCP Server implementation e.g. DHCP Servers vendor.</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.1" 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>dhcpPrimaryDN</alias>
+        <alias>dhcpPoolDN</alias>
       </aliases>
-      <description>The DN of the dhcpServer which is the primary server for the configuration.</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.7" 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>dhcpOption</alias>
+        <alias>dhcpGroupDN</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>The distinguished name(s) of the groups.</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.13" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpHashBucketAssignment</alias>
+        <alias>dhcpSubnetDN</alias>
       </aliases>
-      <description>HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load Balancing Algorithm [RFC 3074].</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.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.14" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
@@ -91,29 +73,20 @@
       <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">
-      <aliases>
-        <alias>dhcpStartTimeOfState</alias>
-      </aliases>
-      <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.24</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.15" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpDomainName</alias>
+        <alias>dhcpLeasesDN</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) client addresses.</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.9" obsolete="false" singlevalue="false" 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>dhcpOptionsDN</alias>
+        <alias>dhcpClassesDN</alias>
       </aliases>
-      <description>The distinguished name(s) of the dhcpOption objects containing the configuration options provided by the server.</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.12</syntax>
       <equality>distinguishedNameMatch</equality>
@@ -127,29 +100,20 @@
       <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.18" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpAssignedToClient</alias>
+        <alias>dhcpSharedNetworkDN</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 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.28" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
-      <aliases>
-        <alias>dhcpDnsStatus</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>
-      <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.31" 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>dhcpReservedForClient</alias>
+        <alias>dhcpServiceDN</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>
+      <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.12</syntax>
       <equality>distinguishedNameMatch</equality>
@@ -163,78 +127,96 @@
       <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.23" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.20" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpExpirationTime</alias>
+        <alias>dhcpVersion</alias>
       </aliases>
-      <description>This is the time the current lease for an address expires.</description>
+      <description>The version attribute of this object.</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.26</syntax>
+      <equality>caseIgnoreIA5Match</equality>
     </attributetype>
-    <attributetype oid="2.16.840.1.113719.1.203.4.4" 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>dhcpRange</alias>
+        <alias>dhcpImplementation</alias>
       </aliases>
-      <description>The starting &amp; ending IP Addresses in the range (inclusive), separated by a hyphen; if the range only contains one address, then just the address can be specified with no hyphen. Each range is defined as a separate value.</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.16" obsolete="false" singlevalue="false" 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>dhcpClassesDN</alias>
+        <alias>dhcpAddressState</alias>
       </aliases>
-      <description>The distinguished name(s) of a class(es) in a subclass.</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.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.25" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.23" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpLastTransactionTime</alias>
+        <alias>dhcpExpirationTime</alias>
       </aliases>
-      <description>This is the last time a valid DHCP packet was received from the client.</description>
+      <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.18" obsolete="false" singlevalue="false" 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>dhcpSharedNetworkDN</alias>
+        <alias>dhcpStartTimeOfState</alias>
       </aliases>
-      <description>The distinguished name(s) of sharedNetworks.</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.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.19" 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>dhcpServiceDN</alias>
+        <alias>dhcpLastTransactionTime</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>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.30" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.26" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpAssignedHostName</alias>
+        <alias>dhcpBootpFlag</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 indicates whether the address was assigned via BOOTP.</description>
+      <usage>USER_APPLICATIONS</usage>
+      <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">
+      <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>
-    <attributetype oid="2.16.840.1.113719.1.203.4.26" 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>dhcpBootpFlag</alias>
+        <alias>dhcpDnsStatus</alias>
       </aliases>
-      <description>This indicates whether the address was assigned via BOOTP.</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.7</syntax>
+      <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.29" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+      <aliases>
+        <alias>dhcpRequestedHostName</alias>
+      </aliases>
+      <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.26</syntax>
+      <equality>caseIgnoreIA5Match</equality>
+    </attributetype>
     <attributetype oid="2.16.840.1.113719.1.203.4.3" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
         <alias>dhcpStatements</alias>
@@ -244,68 +226,85 @@
       <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.33" obsolete="false" singlevalue="true" 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>dhcpRelayAgentInfo</alias>
+        <alias>dhcpAssignedHostName</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 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.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.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.6" obsolete="false" singlevalue="true" 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>dhcpNetMask</alias>
+        <alias>dhcpAssignedToClient</alias>
       </aliases>
-      <description>The subnet mask length for the subnet. The mask can be easily computed from this length.</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.27</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.20" obsolete="false" singlevalue="true" 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>dhcpVersion</alias>
+        <alias>dhcpRelayAgentInfo</alias>
       </aliases>
-      <description>The version attribute of this object.</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.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.38" 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>dhcpFailOverEndpointState</alias>
+        <alias>dhcpHWAddress</alias>
       </aliases>
-      <description>Server (Failover Endpoint) state, as defined in DHCP Failover Protocol [FAILOVR]</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.26</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.8" 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>dhcpClassData</alias>
+        <alias>dhcpHashBucketAssignment</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>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.10" 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>dhcpHostDN</alias>
+        <alias>dhcpDelayedServiceParameter</alias>
       </aliases>
-      <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.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.37" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+      <aliases>
+        <alias>dhcpMaxClientLeadTime</alias>
+      </aliases>
+      <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.27</syntax>
+      <equality>integerMatch</equality>
+    </attributetype>
+    <attributetype oid="2.16.840.1.113719.1.203.4.38" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+      <aliases>
+        <alias>dhcpFailOverEndpointState</alias>
+      </aliases>
+      <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.26</syntax>
+      <equality>integerMatch</equality>
     </attributetype>
     <attributetype oid="2.16.840.1.113719.1.203.4.39" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
@@ -316,14 +315,14 @@
       <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.13" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113719.1.203.4.4" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpSubnetDN</alias>
+        <alias>dhcpRange</alias>
       </aliases>
-      <description>The distinguished name(s) of the subnets.</description>
+      <description>The starting &amp; ending IP Addresses in the range (inclusive), separated by a hyphen; if the range only contains one address, then just the address can be specified with no hyphen. Each range is defined as a separate value.</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.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
@@ -334,90 +333,101 @@
       <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">
+    <attributetype oid="2.16.840.1.113719.1.203.4.6" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>dhcpDelayedServiceParameter</alias>
+        <alias>dhcpNetMask</alias>
       </aliases>
-      <description>Delay in seconds corresponding to Delayed Service Parameter configuration, as defined in DHC Load Balancing Algorithm [RFC 3074].</description>
+      <description>The subnet mask length for the subnet. The mask can be easily computed from this length.</description>
       <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.29" obsolete="false" singlevalue="true" 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>dhcpRequestedHostName</alias>
+        <alias>dhcpOption</alias>
       </aliases>
-      <description>This is the hostname that was requested by the client.</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.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.12" obsolete="false" singlevalue="false" 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>dhcpGroupDN</alias>
+        <alias>dhcpClassData</alias>
       </aliases>
-      <description>The distinguished name(s) of the groups.</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.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.37" 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>dhcpMaxClientLeadTime</alias>
+        <alias>dhcpOptionsDN</alias>
       </aliases>
-      <description>Maximum Client Lead Time configuration in seconds, as defined in DHCP Failover Protocol [FAILOVR]</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.27</syntax>
-      <equality>integerMatch</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+      <equality>distinguishedNameMatch</equality>
     </attributetype>
   </attributetypes>
   <objectclasses>
-    <objectclass oid="2.16.840.1.113719.1.203.6.12" obsolete="false">
+    <objectclass oid="2.16.840.1.113719.1.203.6.1" obsolete="false">
       <aliases>
-        <alias>dhcpServer</alias>
+        <alias>dhcpService</alias>
       </aliases>
-      <description>DHCP Server Object</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>dhcpServiceDN</attributetype>
+        <attributetype>dhcpPrimaryDN</attributetype>
       </mandatory>
       <optional>
-        <attributetype>dhcpVersion</attributetype>
-        <attributetype>dhcpImplementation</attributetype>
-        <attributetype>dhcpHashBucketAssignment</attributetype>
-        <attributetype>dhcpDelayedServiceParameter</attributetype>
-        <attributetype>dhcpMaxClientLeadTime</attributetype>
-        <attributetype>dhcpFailOverEndpointState</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>
     </objectclass>
-    <objectclass oid="2.16.840.1.113719.1.203.6.5" obsolete="false">
+    <objectclass oid="2.16.840.1.113719.1.203.6.10" obsolete="false">
       <aliases>
-        <alias>dhcpGroup</alias>
+        <alias>dhcpLeases</alias>
       </aliases>
-      <description>Group object that lists host DNs and parameters. This is a container object.</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>dhcpAddressState</attributetype>
       </mandatory>
       <optional>
-        <attributetype>dhcpHostDN</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.6" obsolete="false">
+    <objectclass oid="2.16.840.1.113719.1.203.6.11" obsolete="false">
       <aliases>
-        <alias>dhcpHost</alias>
+        <alias>dhcpLog</alias>
       </aliases>
-      <description>This represents information about a particular client</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>
@@ -426,35 +436,50 @@
         <attributetype>cn</attributetype>
       </mandatory>
       <optional>
-        <attributetype>dhcpLeaseDN</attributetype>
+        <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>dhcpOptionsDN</attributetype>
-        <attributetype>dhcpStatements</attributetype>
+        <attributetype>dhcpErrorLog</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="2.16.840.1.113719.1.203.6.7" obsolete="false">
+    <objectclass oid="2.16.840.1.113719.1.203.6.12" obsolete="false">
       <aliases>
-        <alias>dhcpClass</alias>
+        <alias>dhcpServer</alias>
       </aliases>
-      <description>Represents information about a collection of related clients.</description>
+      <description>DHCP Server Object</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
         <attributetype>cn</attributetype>
+        <attributetype>dhcpServiceDN</attributetype>
       </mandatory>
       <optional>
-        <attributetype>dhcpSubclassesDN</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.8" obsolete="false">
+    <objectclass oid="2.16.840.1.113719.1.203.6.2" obsolete="false">
       <aliases>
-        <alias>dhcpSubClass</alias>
+        <alias>dhcpSharedNetwork</alias>
       </aliases>
-      <description>Represents information about a collection of related classes.</description>
+      <description>This stores configuration information for a shared network.</description>
       <superiors>
         <superior>top</superior>
       </superiors>
@@ -463,170 +488,144 @@
         <attributetype>cn</attributetype>
       </mandatory>
       <optional>
-        <attributetype>dhcpClassData</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.9" obsolete="false">
+    <objectclass oid="2.16.840.1.113719.1.203.6.3" obsolete="false">
       <aliases>
-        <alias>dhcpOptions</alias>
+        <alias>dhcpSubnet</alias>
       </aliases>
-      <description>Represents information about a collection of options defined.</description>
+      <description>This class defines a subnet. This is a container object.</description>
       <superiors>
         <superior>top</superior>
       </superiors>
-      <type>AUXILIARY</type>
+      <type>STRUCTURAL</type>
       <mandatory>
         <attributetype>cn</attributetype>
+        <attributetype>dhcpNetMask</attributetype>
       </mandatory>
       <optional>
-        <attributetype>dhcpOption</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.2" obsolete="false">
+    <objectclass oid="2.16.840.1.113719.1.203.6.4" obsolete="false">
       <aliases>
-        <alias>dhcpSharedNetwork</alias>
+        <alias>dhcpPool</alias>
       </aliases>
-      <description>This stores configuration information for a shared network.</description>
+      <description>This stores configuration information about a pool.</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
         <attributetype>cn</attributetype>
+        <attributetype>dhcpRange</attributetype>
       </mandatory>
       <optional>
-        <attributetype>dhcpSubnetDN</attributetype>
-        <attributetype>dhcpPoolDN</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.1" obsolete="false">
+    <objectclass oid="2.16.840.1.113719.1.203.6.5" obsolete="false">
       <aliases>
-        <alias>dhcpService</alias>
+        <alias>dhcpGroup</alias>
       </aliases>
-      <description>Service object that represents the actual DHCP Service configuration. This is a container object.</description>
+      <description>Group object that lists host DNs and parameters. This is a container object.</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
         <attributetype>cn</attributetype>
-        <attributetype>dhcpPrimaryDN</attributetype>
       </mandatory>
       <optional>
-        <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>
     </objectclass>
-    <objectclass oid="2.16.840.1.113719.1.203.6.10" obsolete="false">
+    <objectclass oid="2.16.840.1.113719.1.203.6.6" obsolete="false">
       <aliases>
-        <alias>dhcpLeases</alias>
+        <alias>dhcpHost</alias>
       </aliases>
-      <description>This class represents an IP Address, which may or may not have been leased.</description>
+      <description>This represents information about a particular client</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
         <attributetype>cn</attributetype>
-        <attributetype>dhcpAddressState</attributetype>
       </mandatory>
       <optional>
-        <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>dhcpLeaseDN</attributetype>
         <attributetype>dhcpHWAddress</attributetype>
+        <attributetype>dhcpOptionsDN</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.7" obsolete="false">
       <aliases>
-        <alias>dhcpPool</alias>
+        <alias>dhcpClass</alias>
       </aliases>
-      <description>This stores configuration information about a pool.</description>
+      <description>Represents information about a collection of related clients.</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
         <attributetype>cn</attributetype>
-        <attributetype>dhcpRange</attributetype>
       </mandatory>
       <optional>
-        <attributetype>dhcpClassesDN</attributetype>
-        <attributetype>dhcpPermitList</attributetype>
-        <attributetype>dhcpLeasesDN</attributetype>
+        <attributetype>dhcpSubclassesDN</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.8" obsolete="false">
       <aliases>
-        <alias>dhcpSubnet</alias>
+        <alias>dhcpSubClass</alias>
       </aliases>
-      <description>This class defines a subnet. This is a container object.</description>
+      <description>Represents information about a collection of related classes.</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
         <attributetype>cn</attributetype>
-        <attributetype>dhcpNetMask</attributetype>
       </mandatory>
       <optional>
-        <attributetype>dhcpRange</attributetype>
-        <attributetype>dhcpPoolDN</attributetype>
-        <attributetype>dhcpGroupDN</attributetype>
-        <attributetype>dhcpHostDN</attributetype>
-        <attributetype>dhcpClassesDN</attributetype>
-        <attributetype>dhcpLeasesDN</attributetype>
+        <attributetype>dhcpClassData</attributetype>
         <attributetype>dhcpOptionsDN</attributetype>
         <attributetype>dhcpStatements</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>
   </objectclasses>

Modified: directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/java.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/java.xml?rev=1214294&r1=1214293&r2=1214294&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/java.xml (original)
+++ directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/java.xml Wed Dec 14 15:20:41 2011
@@ -19,28 +19,29 @@
 -->
 <schema name="java">
   <attributetypes>
-    <attributetype oid="1.3.6.1.4.1.42.2.27.4.1.6" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.42.2.27.4.1.10" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>javaClassName</alias>
+        <alias>javaFactory</alias>
       </aliases>
-      <description>Fully qualified name of distinguished Java class or interface</description>
+      <description>Fully qualified Java class name of a JNDI object factory</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
       <equality>caseExactMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.42.2.27.4.1.8" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.42.2.27.4.1.11" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>javaSerializedData</alias>
+        <alias>javaReferenceAddress</alias>
       </aliases>
-      <description>Serialized form of a Java object</description>
+      <description>Addresses associated with a JNDI Reference</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.15</syntax>
+      <equality>caseExactMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.42.2.27.4.1.7" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.42.2.27.4.1.12" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>javaCodebase</alias>
+        <alias>javaDoc</alias>
       </aliases>
-      <description>URL(s) specifying the location of class definition</description>
+      <description>The Java documentation for the class</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
       <equality>caseExactIA5Match</equality>
@@ -54,35 +55,47 @@
       <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
       <equality>caseExactMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.42.2.27.4.1.12" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.42.2.27.4.1.6" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>javaDoc</alias>
+        <alias>javaClassName</alias>
       </aliases>
-      <description>The Java documentation for the class</description>
+      <description>Fully qualified name of distinguished Java class or interface</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseExactIA5Match</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+      <equality>caseExactMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.42.2.27.4.1.11" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.42.2.27.4.1.7" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>javaReferenceAddress</alias>
+        <alias>javaCodebase</alias>
       </aliases>
-      <description>Addresses associated with a JNDI Reference</description>
+      <description>URL(s) specifying the location of class definition</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
-      <equality>caseExactMatch</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+      <equality>caseExactIA5Match</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.42.2.27.4.1.10" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.42.2.27.4.1.8" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>javaFactory</alias>
+        <alias>javaSerializedData</alias>
       </aliases>
-      <description>Fully qualified Java class name of a JNDI object factory</description>
+      <description>Serialized form of a Java object</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
-      <equality>caseExactMatch</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.40</syntax>
     </attributetype>
   </attributetypes>
   <objectclasses>
+    <objectclass oid="1.3.6.1.4.1.42.2.27.4.2.1" obsolete="false">
+      <aliases>
+        <alias>javaContainer</alias>
+      </aliases>
+      <description>Container for a Java object</description>
+      <superiors>
+        <superior>top</superior>
+      </superiors>
+      <type>STRUCTURAL</type>
+      <mandatory>
+        <attributetype>cn</attributetype>
+      </mandatory>
+    </objectclass>
     <objectclass oid="1.3.6.1.4.1.42.2.27.4.2.4" obsolete="false">
       <aliases>
         <alias>javaObject</alias>
@@ -102,19 +115,6 @@
         <attributetype>description</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="1.3.6.1.4.1.42.2.27.4.2.1" obsolete="false">
-      <aliases>
-        <alias>javaContainer</alias>
-      </aliases>
-      <description>Container for a Java object</description>
-      <superiors>
-        <superior>top</superior>
-      </superiors>
-      <type>STRUCTURAL</type>
-      <mandatory>
-        <attributetype>cn</attributetype>
-      </mandatory>
-    </objectclass>
     <objectclass oid="1.3.6.1.4.1.42.2.27.4.2.5" obsolete="false">
       <aliases>
         <alias>javaSerializedObject</alias>

Modified: directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/krb5kdc.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/krb5kdc.xml?rev=1214294&r1=1214293&r2=1214294&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/krb5kdc.xml (original)
+++ directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/krb5kdc.xml Wed Dec 14 15:20:41 2011
@@ -19,10 +19,11 @@
 -->
 <schema name="krb5kdc">
   <attributetypes>
-    <attributetype oid="1.3.6.1.4.1.5322.10.1.12" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.5322.10.1.1" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>krb5RealmName</alias>
+        <alias>krb5PrincipalName</alias>
       </aliases>
+      <description>The unparsed Kerberos principal name</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
       <equality>caseExactIA5Match</equality>
@@ -35,6 +36,24 @@
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.5</syntax>
     </attributetype>
+    <attributetype oid="1.3.6.1.4.1.5322.10.1.11" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+      <aliases>
+        <alias>krb5PrincipalRealm</alias>
+      </aliases>
+      <description>Distinguished name of krb5Realm entry</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="1.3.6.1.4.1.5322.10.1.12" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+      <aliases>
+        <alias>krb5RealmName</alias>
+      </aliases>
+      <usage>USER_APPLICATIONS</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+      <equality>caseExactIA5Match</equality>
+    </attributetype>
     <attributetype oid="1.3.6.1.4.1.5322.10.1.13" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
         <alias>krb5AccountDisabled</alias>
@@ -43,90 +62,79 @@
       <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
       <equality>booleanMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.5322.10.1.1" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.5322.10.1.14" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>krb5PrincipalName</alias>
+        <alias>krb5AccountLockedOut</alias>
       </aliases>
-      <description>The unparsed Kerberos principal name</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseExactIA5Match</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+      <equality>booleanMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.5322.10.1.5" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.5322.10.1.15" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>krb5KDCFlags</alias>
+        <alias>krb5AccountExpirationTime</alias>
       </aliases>
       <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.24</syntax>
+      <equality>generalizedTimeMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.5322.10.1.6" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.5322.10.1.2" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>krb5EncryptionType</alias>
+        <alias>krb5KeyVersionNumber</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="1.3.6.1.4.1.5322.10.1.4" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.5322.10.1.3" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>krb5MaxRenew</alias>
+        <alias>krb5MaxLife</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="1.3.6.1.4.1.5322.10.1.11" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.5322.10.1.4" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>krb5PrincipalRealm</alias>
+        <alias>krb5MaxRenew</alias>
       </aliases>
-      <description>Distinguished name of krb5Realm entry</description>
-      <superior>distinguishedName</superior>
       <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="1.3.6.1.4.1.5322.10.1.7" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.5322.10.1.5" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>krb5ValidStart</alias>
+        <alias>krb5KDCFlags</alias>
       </aliases>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
-      <equality>generalizedTimeMatch</equality>
-      <ordering>generalizedTimeOrderingMatch</ordering>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+      <equality>integerMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.5322.10.1.3" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.5322.10.1.6" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>krb5MaxLife</alias>
+        <alias>krb5EncryptionType</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="1.3.6.1.4.1.5322.10.1.8" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.5322.10.1.7" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>krb5ValidEnd</alias>
+        <alias>krb5ValidStart</alias>
       </aliases>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
       <equality>generalizedTimeMatch</equality>
       <ordering>generalizedTimeOrderingMatch</ordering>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.5322.10.1.2" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
-      <aliases>
-        <alias>krb5KeyVersionNumber</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="1.3.6.1.4.1.5322.10.1.15" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.5322.10.1.8" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>krb5AccountExpirationTime</alias>
+        <alias>krb5ValidEnd</alias>
       </aliases>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
       <equality>generalizedTimeMatch</equality>
+      <ordering>generalizedTimeOrderingMatch</ordering>
     </attributetype>
     <attributetype oid="1.3.6.1.4.1.5322.10.1.9" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
@@ -137,27 +145,23 @@
       <equality>generalizedTimeMatch</equality>
       <ordering>generalizedTimeOrderingMatch</ordering>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.5322.10.1.14" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
-      <aliases>
-        <alias>krb5AccountLockedOut</alias>
-      </aliases>
-      <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
-      <equality>booleanMatch</equality>
-    </attributetype>
   </attributetypes>
   <objectclasses>
-    <objectclass oid="1.3.6.1.4.1.5322.10.2.3" obsolete="false">
+    <objectclass oid="1.3.6.1.4.1.5322.10.2.1" obsolete="false">
       <aliases>
-        <alias>krb5Realm</alias>
+        <alias>krb5Principal</alias>
       </aliases>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>AUXILIARY</type>
       <mandatory>
-        <attributetype>krb5RealmName</attributetype>
+        <attributetype>krb5PrincipalName</attributetype>
       </mandatory>
+      <optional>
+        <attributetype>cn</attributetype>
+        <attributetype>krb5PrincipalRealm</attributetype>
+      </optional>
     </objectclass>
     <objectclass oid="1.3.6.1.4.1.5322.10.2.2" obsolete="false">
       <aliases>
@@ -184,21 +188,17 @@
         <attributetype>krb5AccountExpirationTime</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="1.3.6.1.4.1.5322.10.2.1" obsolete="false">
+    <objectclass oid="1.3.6.1.4.1.5322.10.2.3" obsolete="false">
       <aliases>
-        <alias>krb5Principal</alias>
+        <alias>krb5Realm</alias>
       </aliases>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>AUXILIARY</type>
       <mandatory>
-        <attributetype>krb5PrincipalName</attributetype>
+        <attributetype>krb5RealmName</attributetype>
       </mandatory>
-      <optional>
-        <attributetype>cn</attributetype>
-        <attributetype>krb5PrincipalRealm</attributetype>
-      </optional>
     </objectclass>
   </objectclasses>
 </schema>

Modified: directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/mozilla.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/mozilla.xml?rev=1214294&r1=1214293&r2=1214294&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/mozilla.xml (original)
+++ directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/mozilla.xml Wed Dec 14 15:20:41 2011
@@ -19,72 +19,55 @@
 -->
 <schema name="mozilla">
   <attributetypes>
-    <attributetype oid="1.3.6.1.4.1.13769.2.1.13" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.13769.2.1.1" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>nsAIMid</alias>
+        <alias>xmozillanickname</alias>
+        <alias>mozillaNickname</alias>
       </aliases>
-      <description>AOL Instant Messenger (AIM) Identity</description>
+      <superior>name</superior>
       <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.15</syntax>
+      <equality>caseIgnoreMatch</equality>
+      <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.13769.2.1.7" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.13769.2.1.10" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>mozillaHomeState</alias>
+        <alias>mozillaHomeFriendlyCountryName</alias>
       </aliases>
-      <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="1.3.6.1.4.1.13769.2.1.12" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.13769.2.1.11" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>workurl</alias>
-        <alias>mozillaWorkUrl</alias>
+        <alias>homeurl</alias>
+        <alias>mozillaHomeUrl</alias>
       </aliases>
       <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="1.3.6.1.4.1.13769.2.1.96" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
-      <aliases>
-        <alias>custom1</alias>
-        <alias>mozillaCustom1</alias>
-      </aliases>
-      <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-    </attributetype>
-    <attributetype oid="1.3.6.1.4.1.13769.2.1.97" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.13769.2.1.12" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>custom2</alias>
-        <alias>mozillaCustom2</alias>
+        <alias>workurl</alias>
+        <alias>mozillaWorkUrl</alias>
       </aliases>
       <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="1.3.6.1.4.1.13769.2.1.1" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
-      <aliases>
-        <alias>xmozillanickname</alias>
-        <alias>mozillaNickname</alias>
-      </aliases>
-      <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="1.3.6.1.4.1.13769.2.1.9" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.13769.2.1.13" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>mozillaHomeCountryName</alias>
+        <alias>nsAIMid</alias>
       </aliases>
-      <superior>name</superior>
+      <description>AOL Instant Messenger (AIM) Identity</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="1.3.6.1.4.1.13769.2.1.2" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
@@ -103,76 +86,93 @@
       <equality>caseIgnoreIA5Match</equality>
       <substring>caseIgnoreIA5SubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.13769.2.1.98" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.13769.2.1.4" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>custom3</alias>
-        <alias>mozillaCustom3</alias>
+        <alias>mozillaHomeLocalityName</alias>
       </aliases>
       <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.15</syntax>
+      <equality>caseIgnoreMatch</equality>
+      <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.13769.2.1.4" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.13769.2.1.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>mozillaHomeLocalityName</alias>
+        <alias>mozillaPostalAddress2</alias>
+      </aliases>
+      <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="1.3.6.1.4.1.13769.2.1.6" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+      <aliases>
+        <alias>mozillaHomePostalAddress2</alias>
+      </aliases>
+      <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="1.3.6.1.4.1.13769.2.1.7" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+      <aliases>
+        <alias>mozillaHomeState</alias>
       </aliases>
+      <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="1.3.6.1.4.1.13769.2.1.99" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.13769.2.1.8" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>custom4</alias>
-        <alias>mozillaCustom4</alias>
+        <alias>mozillaHomePostalCode</alias>
       </aliases>
       <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.15</syntax>
+      <equality>caseIgnoreMatch</equality>
+      <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.13769.2.1.10" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.13769.2.1.9" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>mozillaHomeFriendlyCountryName</alias>
+        <alias>mozillaHomeCountryName</alias>
       </aliases>
+      <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="1.3.6.1.4.1.13769.2.1.6" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.13769.2.1.96" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>mozillaHomePostalAddress2</alias>
+        <alias>custom1</alias>
+        <alias>mozillaCustom1</alias>
       </aliases>
       <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.26</syntax>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.13769.2.1.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.13769.2.1.97" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>mozillaPostalAddress2</alias>
+        <alias>custom2</alias>
+        <alias>mozillaCustom2</alias>
       </aliases>
       <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.26</syntax>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.13769.2.1.11" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.13769.2.1.98" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>homeurl</alias>
-        <alias>mozillaHomeUrl</alias>
+        <alias>custom3</alias>
+        <alias>mozillaCustom3</alias>
       </aliases>
       <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="1.3.6.1.4.1.13769.2.1.8" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.13769.2.1.99" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>mozillaHomePostalCode</alias>
+        <alias>custom4</alias>
+        <alias>mozillaCustom4</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.26</syntax>
     </attributetype>
   </attributetypes>
   <objectclasses>



Mime
View raw message