directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1478829 [7/9] - /directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/
Date Fri, 03 May 2013 15:08:45 GMT
Modified: directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/inetorgperson.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/inetorgperson.xml?rev=1478829&r1=1478828&r2=1478829&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/inetorgperson.xml (original)
+++ directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/inetorgperson.xml Fri May  3 15:08:44 2013
@@ -19,19 +19,19 @@
 -->
 <schema name="inetorgperson">
   <attributetypes>
-    <attributetype oid="2.16.840.1.113730.3.1.216" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113730.3.1.40" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>userPKCS12</alias>
+        <alias>userSMIMECertificate</alias>
       </aliases>
-      <description>RFC2798: personal identity information, a PKCS #12 PFX</description>
+      <description>RFC2798: PKCS#7 SignedData used to support S/MIME</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.5</syntax>
     </attributetype>
-    <attributetype oid="2.16.840.1.113730.3.1.39" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113730.3.1.2" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>preferredLanguage</alias>
+        <alias>departmentNumber</alias>
       </aliases>
-      <description>RFC2798: preferred written or spoken language for a person</description>
+      <description>RFC2798: identifies a department within an organization</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
       <equality>caseIgnoreMatch</equality>
@@ -47,29 +47,29 @@
       <equality>caseIgnoreMatch</equality>
       <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="2.16.840.1.113730.3.1.40" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113730.3.1.4" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>userSMIMECertificate</alias>
+        <alias>employeeType</alias>
       </aliases>
-      <description>RFC2798: PKCS#7 SignedData used to support S/MIME</description>
+      <description>RFC2798: type of employment for a person</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.5</syntax>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+      <equality>caseIgnoreMatch</equality>
+      <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="2.16.840.1.113730.3.1.241" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113730.3.1.216" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>displayName</alias>
+        <alias>userPKCS12</alias>
       </aliases>
-      <description>RFC2798: preferred name to be used when displaying entries</description>
+      <description>RFC2798: personal identity information, a PKCS #12 PFX</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.5</syntax>
     </attributetype>
-    <attributetype oid="2.16.840.1.113730.3.1.4" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113730.3.1.39" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>employeeType</alias>
+        <alias>preferredLanguage</alias>
       </aliases>
-      <description>RFC2798: type of employment for a person</description>
+      <description>RFC2798: preferred written or spoken language for a person</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
       <equality>caseIgnoreMatch</equality>
@@ -85,11 +85,11 @@
       <equality>caseIgnoreMatch</equality>
       <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="2.16.840.1.113730.3.1.2" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.16.840.1.113730.3.1.241" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>departmentNumber</alias>
+        <alias>displayName</alias>
       </aliases>
-      <description>RFC2798: identifies a department within an organization</description>
+      <description>RFC2798: preferred name to be used when displaying entries</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
       <equality>caseIgnoreMatch</equality>

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=1478829&r1=1478828&r2=1478829&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/java.xml (original)
+++ directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/java.xml Fri May  3 15:08:44 2013
@@ -19,15 +19,24 @@
 -->
 <schema name="java">
   <attributetypes>
-    <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.11" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>javaFactory</alias>
+        <alias>javaReferenceAddress</alias>
       </aliases>
-      <description>Fully qualified Java class name of a JNDI object factory</description>
+      <description>Addresses associated with a JNDI Reference</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.7" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+      <aliases>
+        <alias>javaCodebase</alias>
+      </aliases>
+      <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.26</syntax>
+      <equality>caseExactIA5Match</equality>
+    </attributetype>
     <attributetype oid="1.3.6.1.4.1.42.2.27.4.1.13" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
         <alias>javaClassNames</alias>
@@ -37,19 +46,11 @@
       <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">
-      <aliases>
-        <alias>javaSerializedData</alias>
-      </aliases>
-      <description>Serialized form of a Java object</description>
-      <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.40</syntax>
-    </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.6" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>javaReferenceAddress</alias>
+        <alias>javaClassName</alias>
       </aliases>
-      <description>Addresses associated with a JNDI Reference</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.15</syntax>
       <equality>caseExactMatch</equality>
@@ -63,44 +64,44 @@
       <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.7" obsolete="false" singlevalue="false" 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>javaCodebase</alias>
+        <alias>javaSerializedData</alias>
       </aliases>
-      <description>URL(s) specifying the location of class definition</description>
+      <description>Serialized form of a Java object</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.40</syntax>
     </attributetype>
-    <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>
   </attributetypes>
   <objectclasses>
-    <objectclass oid="1.3.6.1.4.1.42.2.27.4.2.1" obsolete="false">
+    <objectclass oid="1.3.6.1.4.1.42.2.27.4.2.7" obsolete="false">
       <aliases>
-        <alias>javaContainer</alias>
+        <alias>javaNamingReference</alias>
       </aliases>
-      <description>Container for a Java object</description>
+      <description>JNDI reference</description>
       <superiors>
-        <superior>top</superior>
+        <superior>javaObject</superior>
       </superiors>
-      <type>STRUCTURAL</type>
-      <mandatory>
-        <attributetype>cn</attributetype>
-      </mandatory>
+      <type>AUXILIARY</type>
+      <optional>
+        <attributetype>javaReferenceAddress</attributetype>
+        <attributetype>javaFactory</attributetype>
+      </optional>
     </objectclass>
-    <objectclass oid="1.3.6.1.4.1.42.2.27.4.2.5" obsolete="false">
+    <objectclass oid="1.3.6.1.4.1.42.2.27.4.2.8" obsolete="false">
       <aliases>
-        <alias>javaSerializedObject</alias>
+        <alias>javaMarshalledObject</alias>
       </aliases>
-      <description>Java serialized object</description>
+      <description>Java marshalled object</description>
       <superiors>
         <superior>javaObject</superior>
       </superiors>
@@ -109,17 +110,17 @@
         <attributetype>javaSerializedData</attributetype>
       </mandatory>
     </objectclass>
-    <objectclass oid="1.3.6.1.4.1.42.2.27.4.2.8" obsolete="false">
+    <objectclass oid="1.3.6.1.4.1.42.2.27.4.2.1" obsolete="false">
       <aliases>
-        <alias>javaMarshalledObject</alias>
+        <alias>javaContainer</alias>
       </aliases>
-      <description>Java marshalled object</description>
+      <description>Container for a Java object</description>
       <superiors>
-        <superior>javaObject</superior>
+        <superior>top</superior>
       </superiors>
-      <type>AUXILIARY</type>
+      <type>STRUCTURAL</type>
       <mandatory>
-        <attributetype>javaSerializedData</attributetype>
+        <attributetype>cn</attributetype>
       </mandatory>
     </objectclass>
     <objectclass oid="1.3.6.1.4.1.42.2.27.4.2.4" obsolete="false">
@@ -141,19 +142,18 @@
         <attributetype>description</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="1.3.6.1.4.1.42.2.27.4.2.7" obsolete="false">
+    <objectclass oid="1.3.6.1.4.1.42.2.27.4.2.5" obsolete="false">
       <aliases>
-        <alias>javaNamingReference</alias>
+        <alias>javaSerializedObject</alias>
       </aliases>
-      <description>JNDI reference</description>
+      <description>Java serialized object</description>
       <superiors>
         <superior>javaObject</superior>
       </superiors>
       <type>AUXILIARY</type>
-      <optional>
-        <attributetype>javaReferenceAddress</attributetype>
-        <attributetype>javaFactory</attributetype>
-      </optional>
+      <mandatory>
+        <attributetype>javaSerializedData</attributetype>
+      </mandatory>
     </objectclass>
   </objectclasses>
 </schema>

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=1478829&r1=1478828&r2=1478829&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/krb5kdc.xml (original)
+++ directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/krb5kdc.xml Fri May  3 15:08:44 2013
@@ -19,30 +19,30 @@
 -->
 <schema name="krb5kdc">
   <attributetypes>
-    <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.9" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>krb5AccountExpirationTime</alias>
+        <alias>krb5PasswordEnd</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">
+    <attributetype oid="1.3.6.1.4.1.5322.10.1.15" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>krb5PasswordEnd</alias>
+        <alias>krb5AccountExpirationTime</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.4" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.5322.10.1.10" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>krb5MaxRenew</alias>
+        <alias>krb5Key</alias>
       </aliases>
+      <description>Encoded ASN1 Key as an octet string</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.5</syntax>
     </attributetype>
     <attributetype oid="1.3.6.1.4.1.5322.10.1.12" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
@@ -52,9 +52,18 @@
       <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.3" obsolete="false" singlevalue="true" 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>krb5MaxLife</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>
+    </attributetype>
+    <attributetype oid="1.3.6.1.4.1.5322.10.1.6" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+      <aliases>
+        <alias>krb5EncryptionType</alias>
       </aliases>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
@@ -68,30 +77,30 @@
       <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.5" 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>krb5KDCFlags</alias>
+        <alias>krb5ValidEnd</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>
+      <ordering>generalizedTimeOrderingMatch</ordering>
     </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.3" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>krb5EncryptionType</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.8" obsolete="false" singlevalue="true" 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>krb5ValidEnd</alias>
+        <alias>krb5MaxRenew</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.14" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
@@ -101,22 +110,23 @@
       <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.10" obsolete="false" singlevalue="false" 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>krb5Key</alias>
+        <alias>krb5KDCFlags</alias>
       </aliases>
-      <description>Encoded ASN1 Key as an octet string</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.5</syntax>
+      <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.1" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.5322.10.1.11" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>krb5PrincipalName</alias>
+        <alias>krb5PrincipalRealm</alias>
       </aliases>
-      <description>The unparsed Kerberos principal name</description>
+      <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.26</syntax>
-      <equality>caseExactIA5Match</equality>
+      <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.7" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
@@ -135,16 +145,6 @@
       <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.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>
   </attributetypes>
   <objectclasses>
     <objectclass oid="1.3.6.1.4.1.5322.10.2.2" obsolete="false">
@@ -172,33 +172,33 @@
         <attributetype>krb5AccountExpirationTime</attributetype>
       </optional>
     </objectclass>
-    <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.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=1478829&r1=1478828&r2=1478829&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/mozilla.xml (original)
+++ directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/mozilla.xml Fri May  3 15:08:44 2013
@@ -19,6 +19,24 @@
 -->
 <schema name="mozilla">
   <attributetypes>
+    <attributetype oid="1.3.6.1.4.1.13769.2.1.12" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+      <aliases>
+        <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.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.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
         <alias>mozillaPostalAddress2</alias>
@@ -28,9 +46,19 @@
       <equality>caseIgnoreListMatch</equality>
       <substring>caseIgnoreListSubstringsMatch</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.6" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>mozillaHomeCountryName</alias>
+        <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.1" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+      <aliases>
+        <alias>xmozillanickname</alias>
+        <alias>mozillaNickname</alias>
       </aliases>
       <superior>name</superior>
       <usage>USER_APPLICATIONS</usage>
@@ -38,35 +66,35 @@
       <equality>caseIgnoreMatch</equality>
       <substring>caseIgnoreSubstringsMatch</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.7" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>mozillaHomePostalCode</alias>
+        <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.97" obsolete="false" singlevalue="true" 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>custom2</alias>
-        <alias>mozillaCustom2</alias>
+        <alias>custom4</alias>
+        <alias>mozillaCustom4</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.6" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.13769.2.1.2" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>mozillaHomePostalAddress2</alias>
+        <alias>xmozillausehtmlmail</alias>
+        <alias>mozillaUseHtmlMail</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.7</syntax>
     </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.9" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>mozillaHomeState</alias>
+        <alias>mozillaHomeCountryName</alias>
       </aliases>
       <superior>name</superior>
       <usage>USER_APPLICATIONS</usage>
@@ -74,105 +102,77 @@
       <equality>caseIgnoreMatch</equality>
       <substring>caseIgnoreSubstringsMatch</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.97" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>custom3</alias>
-        <alias>mozillaCustom3</alias>
+        <alias>custom2</alias>
+        <alias>mozillaCustom2</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.10" obsolete="false" singlevalue="false" 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>mozillaHomeFriendlyCountryName</alias>
+        <alias>mozillaHomeLocalityName</alias>
       </aliases>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
       <equality>caseIgnoreMatch</equality>
       <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.13769.2.1.13" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
-      <aliases>
-        <alias>nsAIMid</alias>
-      </aliases>
-      <description>AOL Instant Messenger (AIM) Identity</description>
-      <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.50</syntax>
-      <equality>telephoneNumberMatch</equality>
-      <substring>telephoneNumberSubstringsMatch</substring>
-    </attributetype>
-    <attributetype oid="1.3.6.1.4.1.13769.2.1.12" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
-      <aliases>
-        <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.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.4" obsolete="false" singlevalue="false" 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>mozillaHomeLocalityName</alias>
+        <alias>mozillaHomePostalCode</alias>
       </aliases>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
       <equality>caseIgnoreMatch</equality>
       <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.13769.2.1.2" obsolete="false" singlevalue="true" 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>xmozillausehtmlmail</alias>
-        <alias>mozillaUseHtmlMail</alias>
+        <alias>mozillaHomeFriendlyCountryName</alias>
       </aliases>
       <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.15</syntax>
+      <equality>caseIgnoreMatch</equality>
+      <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.13769.2.1.3" 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>mozillaSecondEmail</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.99" 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>custom4</alias>
-        <alias>mozillaCustom4</alias>
+        <alias>nsAIMid</alias>
       </aliases>
+      <description>AOL Instant Messenger (AIM) Identity</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.50</syntax>
+      <equality>telephoneNumberMatch</equality>
+      <substring>telephoneNumberSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.13769.2.1.96" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.13769.2.1.3" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>custom1</alias>
-        <alias>mozillaCustom1</alias>
+        <alias>mozillaSecondEmail</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.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>
+      <equality>caseIgnoreIA5Match</equality>
+      <substring>caseIgnoreIA5SubstringsMatch</substring>
     </attributetype>
   </attributetypes>
   <objectclasses>

Modified: directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/nis.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/nis.xml?rev=1478829&r1=1478828&r2=1478829&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/nis.xml (original)
+++ directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/nis.xml Fri May  3 15:08:44 2013
@@ -19,6 +19,42 @@
 -->
 <schema name="nis">
   <attributetypes>
+    <attributetype oid="1.3.6.1.1.1.1.22" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+      <aliases>
+        <alias>macAddress</alias>
+      </aliases>
+      <description>MAC address</description>
+      <usage>USER_APPLICATIONS</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+      <equality>caseIgnoreIA5Match</equality>
+    </attributetype>
+    <attributetype oid="1.3.6.1.1.1.1.7" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+      <aliases>
+        <alias>shadowMax</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.1.1.1.26" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+      <aliases>
+        <alias>nisMapName</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.1.1.1.3" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+      <aliases>
+        <alias>homeDirectory</alias>
+      </aliases>
+      <description>The absolute path to the home directory</description>
+      <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.1.1.1.15" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
         <alias>ipServicePort</alias>
@@ -27,38 +63,39 @@
       <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
       <equality>integerMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.1.1.1.9" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.1.1.1.8" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>shadowInactive</alias>
+        <alias>shadowWarning</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.1.1.1.5" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.1.1.1.6" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>shadowLastChange</alias>
+        <alias>shadowMin</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.1.1.1.4" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.1.1.1.13" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>loginShell</alias>
+        <alias>memberNisNetgroup</alias>
       </aliases>
-      <description>The path to the login shell</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
       <equality>caseExactIA5Match</equality>
+      <substring>caseExactIA5SubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="1.3.6.1.1.1.1.18" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.1.1.1.4" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>oncRpcNumber</alias>
+        <alias>loginShell</alias>
       </aliases>
+      <description>The path to the login shell</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.26</syntax>
+      <equality>caseExactIA5Match</equality>
     </attributetype>
     <attributetype oid="1.3.6.1.1.1.1.27" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
@@ -69,47 +106,44 @@
       <equality>caseExactIA5Match</equality>
       <substring>caseExactIA5SubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="1.3.6.1.1.1.1.3" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.1.1.1.19" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>homeDirectory</alias>
+        <alias>ipHostNumber</alias>
       </aliases>
-      <description>The absolute path to the home directory</description>
+      <description>IP address</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseExactIA5Match</equality>
+      <equality>caseIgnoreIA5Match</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.1.1.1.7" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.1.1.1.17" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>shadowMax</alias>
+        <alias>ipProtocolNumber</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.1.1.1.24" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.1.1.1.18" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>bootFile</alias>
+        <alias>oncRpcNumber</alias>
       </aliases>
-      <description>Boot image 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.27</syntax>
+      <equality>integerMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.1.1.1.16" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.1.1.1.9" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>ipServiceProtocol</alias>
+        <alias>shadowInactive</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>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+      <equality>integerMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.1.1.1.21" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.1.1.1.20" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>ipNetmaskNumber</alias>
+        <alias>ipNetworkNumber</alias>
       </aliases>
-      <description>IP netmask</description>
+      <description>IP network</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
       <equality>caseIgnoreIA5Match</equality>
@@ -122,116 +156,83 @@
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.1.1.0.0</syntax>
     </attributetype>
-    <attributetype oid="1.3.6.1.1.1.1.23" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.1.1.1.2" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>bootParameter</alias>
+        <alias>gecos</alias>
       </aliases>
-      <description>rpc.bootparamd parameter</description>
+      <description>The GECOS field; the common name</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.1.1.0.1</syntax>
+      <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.1.1.1.12" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.1.1.1.24" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>memberUid</alias>
+        <alias>bootFile</alias>
       </aliases>
+      <description>Boot image name</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
       <equality>caseExactIA5Match</equality>
-      <substring>caseExactIA5SubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="1.3.6.1.1.1.1.26" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
-      <aliases>
-        <alias>nisMapName</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.1.1.1.6" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.1.1.1.10" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>shadowMin</alias>
+        <alias>shadowExpire</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.1.1.1.13" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.1.1.1.12" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>memberNisNetgroup</alias>
+        <alias>memberUid</alias>
       </aliases>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
       <equality>caseExactIA5Match</equality>
       <substring>caseExactIA5SubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="1.3.6.1.1.1.1.17" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
-      <aliases>
-        <alias>ipProtocolNumber</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.1.1.1.8" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.1.1.1.1" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>shadowWarning</alias>
+        <alias>gidNumber</alias>
       </aliases>
+      <description>An integer uniquely identifying a group in an administrative domain</description>
       <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.1.1.1.20" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
-      <aliases>
-        <alias>ipNetworkNumber</alias>
-      </aliases>
-      <description>IP network</description>
-      <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseIgnoreIA5Match</equality>
-    </attributetype>
-    <attributetype oid="1.3.6.1.1.1.1.0" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.1.1.1.16" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>uidNumber</alias>
+        <alias>ipServiceProtocol</alias>
       </aliases>
-      <description>An integer uniquely identifying a user in an administrative domain</description>
+      <superior>name</superior>
       <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.15</syntax>
+      <equality>caseIgnoreMatch</equality>
+      <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="1.3.6.1.1.1.1.19" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.1.1.1.21" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>ipHostNumber</alias>
+        <alias>ipNetmaskNumber</alias>
       </aliases>
-      <description>IP address</description>
+      <description>IP netmask</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
       <equality>caseIgnoreIA5Match</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.1.1.1.10" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
-      <aliases>
-        <alias>shadowExpire</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.1.1.1.2" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.1.1.1.23" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>gecos</alias>
+        <alias>bootParameter</alias>
       </aliases>
-      <description>The GECOS field; the common name</description>
+      <description>rpc.bootparamd parameter</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseIgnoreIA5Match</equality>
-      <substring>caseIgnoreIA5SubstringsMatch</substring>
+      <syntax>1.3.6.1.1.1.0.1</syntax>
     </attributetype>
-    <attributetype oid="1.3.6.1.1.1.1.1" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.1.1.1.0" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>gidNumber</alias>
+        <alias>uidNumber</alias>
       </aliases>
-      <description>An integer uniquely identifying a group in an administrative domain</description>
+      <description>An integer uniquely identifying a user in an administrative domain</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
       <equality>integerMatch</equality>
@@ -244,108 +245,120 @@
       <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
       <equality>integerMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.1.1.1.22" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.1.1.1.5" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>macAddress</alias>
+        <alias>shadowLastChange</alias>
       </aliases>
-      <description>MAC address</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseIgnoreIA5Match</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+      <equality>integerMatch</equality>
     </attributetype>
   </attributetypes>
   <objectclasses>
-    <objectclass oid="1.3.6.1.1.1.2.2" obsolete="false">
+    <objectclass oid="1.3.6.1.1.1.2.8" obsolete="false">
       <aliases>
-        <alias>posixGroup</alias>
+        <alias>nisNetgroup</alias>
       </aliases>
-      <description>Abstraction of a group of accounts</description>
+      <description>Abstraction of a netgroup</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
         <attributetype>cn</attributetype>
-        <attributetype>gidNumber</attributetype>
       </mandatory>
       <optional>
-        <attributetype>userPassword</attributetype>
-        <attributetype>memberUid</attributetype>
+        <attributetype>nisNetgroupTriple</attributetype>
+        <attributetype>memberNisNetgroup</attributetype>
         <attributetype>description</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="1.3.6.1.1.1.2.10" obsolete="false">
+    <objectclass oid="1.3.6.1.1.1.2.1" obsolete="false">
       <aliases>
-        <alias>nisObject</alias>
+        <alias>shadowAccount</alias>
       </aliases>
-      <description>An entry in a NIS map</description>
+      <description>Additional attributes for shadow passwords</description>
       <superiors>
         <superior>top</superior>
       </superiors>
-      <type>STRUCTURAL</type>
+      <type>AUXILIARY</type>
       <mandatory>
-        <attributetype>cn</attributetype>
-        <attributetype>nisMapEntry</attributetype>
-        <attributetype>nisMapName</attributetype>
+        <attributetype>uid</attributetype>
       </mandatory>
       <optional>
+        <attributetype>userPassword</attributetype>
+        <attributetype>shadowLastChange</attributetype>
+        <attributetype>shadowMin</attributetype>
+        <attributetype>shadowMax</attributetype>
+        <attributetype>shadowWarning</attributetype>
+        <attributetype>shadowInactive</attributetype>
+        <attributetype>shadowExpire</attributetype>
+        <attributetype>shadowFlag</attributetype>
         <attributetype>description</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="1.3.6.1.1.1.2.0" obsolete="false">
+    <objectclass oid="1.3.6.1.1.1.2.12" obsolete="false">
       <aliases>
-        <alias>posixAccount</alias>
+        <alias>bootableDevice</alias>
       </aliases>
-      <description>Abstraction of an account with POSIX attributes</description>
+      <description>A device with boot parameters</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>AUXILIARY</type>
+      <optional>
+        <attributetype>bootFile</attributetype>
+        <attributetype>bootParameter</attributetype>
+      </optional>
+    </objectclass>
+    <objectclass oid="1.3.6.1.1.1.2.5" obsolete="false">
+      <aliases>
+        <alias>oncRpc</alias>
+      </aliases>
+      <description>Abstraction of an ONC/RPC binding</description>
+      <superiors>
+        <superior>top</superior>
+      </superiors>
+      <type>STRUCTURAL</type>
       <mandatory>
         <attributetype>cn</attributetype>
-        <attributetype>uid</attributetype>
-        <attributetype>uidNumber</attributetype>
-        <attributetype>gidNumber</attributetype>
-        <attributetype>homeDirectory</attributetype>
+        <attributetype>oncRpcNumber</attributetype>
       </mandatory>
       <optional>
-        <attributetype>userPassword</attributetype>
-        <attributetype>loginShell</attributetype>
-        <attributetype>gecos</attributetype>
         <attributetype>description</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="1.3.6.1.1.1.2.9" obsolete="false">
+    <objectclass oid="1.3.6.1.1.1.2.4" obsolete="false">
       <aliases>
-        <alias>nisMap</alias>
+        <alias>ipProtocol</alias>
       </aliases>
-      <description>A generic abstraction of a NIS map</description>
+      <description>Abstraction of an IP protocol</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
-        <attributetype>nisMapName</attributetype>
+        <attributetype>cn</attributetype>
+        <attributetype>ipProtocolNumber</attributetype>
       </mandatory>
       <optional>
         <attributetype>description</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="1.3.6.1.1.1.2.7" obsolete="false">
+    <objectclass oid="1.3.6.1.1.1.2.6" obsolete="false">
       <aliases>
-        <alias>ipNetwork</alias>
+        <alias>ipHost</alias>
       </aliases>
-      <description>Abstraction of an IP network</description>
+      <description>Abstraction of a host, an IP device</description>
       <superiors>
         <superior>top</superior>
       </superiors>
-      <type>STRUCTURAL</type>
+      <type>AUXILIARY</type>
       <mandatory>
         <attributetype>cn</attributetype>
-        <attributetype>ipNetworkNumber</attributetype>
+        <attributetype>ipHostNumber</attributetype>
       </mandatory>
       <optional>
-        <attributetype>ipNetmaskNumber</attributetype>
         <attributetype>l</attributetype>
         <attributetype>description</attributetype>
         <attributetype>manager</attributetype>
@@ -364,131 +377,118 @@
         <attributetype>macAddress</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="1.3.6.1.1.1.2.5" obsolete="false">
+    <objectclass oid="1.3.6.1.1.1.2.3" obsolete="false">
       <aliases>
-        <alias>oncRpc</alias>
+        <alias>ipService</alias>
       </aliases>
-      <description>Abstraction of an ONC/RPC binding</description>
+      <description>Abstraction an Internet Protocol service</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
         <attributetype>cn</attributetype>
-        <attributetype>oncRpcNumber</attributetype>
+        <attributetype>ipServicePort</attributetype>
+        <attributetype>ipServiceProtocol</attributetype>
       </mandatory>
       <optional>
         <attributetype>description</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="1.3.6.1.1.1.2.1" obsolete="false">
+    <objectclass oid="1.3.6.1.1.1.2.10" obsolete="false">
       <aliases>
-        <alias>shadowAccount</alias>
+        <alias>nisObject</alias>
       </aliases>
-      <description>Additional attributes for shadow passwords</description>
+      <description>An entry in a NIS map</description>
       <superiors>
         <superior>top</superior>
       </superiors>
-      <type>AUXILIARY</type>
+      <type>STRUCTURAL</type>
       <mandatory>
-        <attributetype>uid</attributetype>
+        <attributetype>cn</attributetype>
+        <attributetype>nisMapEntry</attributetype>
+        <attributetype>nisMapName</attributetype>
       </mandatory>
       <optional>
-        <attributetype>userPassword</attributetype>
-        <attributetype>shadowLastChange</attributetype>
-        <attributetype>shadowMin</attributetype>
-        <attributetype>shadowMax</attributetype>
-        <attributetype>shadowWarning</attributetype>
-        <attributetype>shadowInactive</attributetype>
-        <attributetype>shadowExpire</attributetype>
-        <attributetype>shadowFlag</attributetype>
         <attributetype>description</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="1.3.6.1.1.1.2.3" obsolete="false">
+    <objectclass oid="1.3.6.1.1.1.2.2" obsolete="false">
       <aliases>
-        <alias>ipService</alias>
+        <alias>posixGroup</alias>
       </aliases>
-      <description>Abstraction an Internet Protocol service</description>
+      <description>Abstraction of a group of accounts</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
         <attributetype>cn</attributetype>
-        <attributetype>ipServicePort</attributetype>
-        <attributetype>ipServiceProtocol</attributetype>
+        <attributetype>gidNumber</attributetype>
       </mandatory>
       <optional>
+        <attributetype>userPassword</attributetype>
+        <attributetype>memberUid</attributetype>
         <attributetype>description</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="1.3.6.1.1.1.2.4" obsolete="false">
+    <objectclass oid="1.3.6.1.1.1.2.9" obsolete="false">
       <aliases>
-        <alias>ipProtocol</alias>
+        <alias>nisMap</alias>
       </aliases>
-      <description>Abstraction of an IP protocol</description>
+      <description>A generic abstraction of a NIS map</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
-        <attributetype>cn</attributetype>
-        <attributetype>ipProtocolNumber</attributetype>
+        <attributetype>nisMapName</attributetype>
       </mandatory>
       <optional>
         <attributetype>description</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="1.3.6.1.1.1.2.12" obsolete="false">
-      <aliases>
-        <alias>bootableDevice</alias>
-      </aliases>
-      <description>A device with boot parameters</description>
-      <superiors>
-        <superior>top</superior>
-      </superiors>
-      <type>AUXILIARY</type>
-      <optional>
-        <attributetype>bootFile</attributetype>
-        <attributetype>bootParameter</attributetype>
-      </optional>
-    </objectclass>
-    <objectclass oid="1.3.6.1.1.1.2.8" obsolete="false">
+    <objectclass oid="1.3.6.1.1.1.2.7" obsolete="false">
       <aliases>
-        <alias>nisNetgroup</alias>
+        <alias>ipNetwork</alias>
       </aliases>
-      <description>Abstraction of a netgroup</description>
+      <description>Abstraction of an IP network</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
         <attributetype>cn</attributetype>
+        <attributetype>ipNetworkNumber</attributetype>
       </mandatory>
       <optional>
-        <attributetype>nisNetgroupTriple</attributetype>
-        <attributetype>memberNisNetgroup</attributetype>
+        <attributetype>ipNetmaskNumber</attributetype>
+        <attributetype>l</attributetype>
         <attributetype>description</attributetype>
+        <attributetype>manager</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="1.3.6.1.1.1.2.6" obsolete="false">
+    <objectclass oid="1.3.6.1.1.1.2.0" obsolete="false">
       <aliases>
-        <alias>ipHost</alias>
+        <alias>posixAccount</alias>
       </aliases>
-      <description>Abstraction of a host, an IP device</description>
+      <description>Abstraction of an account with POSIX attributes</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>AUXILIARY</type>
       <mandatory>
         <attributetype>cn</attributetype>
-        <attributetype>ipHostNumber</attributetype>
+        <attributetype>uid</attributetype>
+        <attributetype>uidNumber</attributetype>
+        <attributetype>gidNumber</attributetype>
+        <attributetype>homeDirectory</attributetype>
       </mandatory>
       <optional>
-        <attributetype>l</attributetype>
+        <attributetype>userPassword</attributetype>
+        <attributetype>loginShell</attributetype>
+        <attributetype>gecos</attributetype>
         <attributetype>description</attributetype>
-        <attributetype>manager</attributetype>
       </optional>
     </objectclass>
   </objectclasses>
@@ -501,11 +501,11 @@
     </matchingrule>
   </matchingrules>
   <syntaxes>
-    <syntax oid="1.3.6.1.1.1.0.0" obsolete="false" humanreadable="true">
-      <description>RFC2307 NIS Netgroup Triple</description>
-    </syntax>
     <syntax oid="1.3.6.1.1.1.0.1" obsolete="false" humanreadable="true">
       <description>NIS Boot Parameter</description>
     </syntax>
+    <syntax oid="1.3.6.1.1.1.0.0" obsolete="false" humanreadable="true">
+      <description>RFC2307 NIS Netgroup Triple</description>
+    </syntax>
   </syntaxes>
 </schema>

Modified: directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/pwdpolicy.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/pwdpolicy.xml?rev=1478829&r1=1478828&r2=1478829&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/pwdpolicy.xml (original)
+++ directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/pwdpolicy.xml Fri May  3 15:08:44 2013
@@ -19,181 +19,176 @@
 -->
 <schema name="pwdpolicy">
   <attributetypes>
-    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.28" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.11" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>pwdEndTime</alias>
+        <alias>pwdMaxFailure</alias>
       </aliases>
-      <description>The time the password becomes disabled</description>
       <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.42.2.27.8.1.5" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.31" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>pwdCheckQuality</alias>
+        <alias>pwdMaxLength</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.42.2.27.8.1.14" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.5" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>pwdAllowUserChange</alias>
+        <alias>pwdCheckQuality</alias>
       </aliases>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
-      <equality>booleanMatch</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.42.2.27.8.1.19" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
+    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.21" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
       <aliases>
-        <alias>pwdFailureTime</alias>
+        <alias>pwdGraceUseTime</alias>
       </aliases>
-      <description>The timestamps of the last consecutive authentication failures</description>
+      <description>The timestamps of the grace authentication after the password has expired</description>
       <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.42.2.27.8.1.23" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
-      <aliases>
-        <alias>pwdPolicySubentry</alias>
-      </aliases>
-      <description>The pwdPolicy subentry in effect for this object</description>
-      <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.42.2.27.8.1.20" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
+    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.4" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>pwdHistory</alias>
+        <alias>pwdInHistory</alias>
       </aliases>
-      <description>The history of user s passwords</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.40</syntax>
-      <equality>octetStringMatch</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.42.2.27.8.1.27" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.16" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
       <aliases>
-        <alias>pwdStartTime</alias>
+        <alias>pwdChangedTime</alias>
       </aliases>
-      <description>The time the password becomes enabled</description>
+      <description>The time the password was last changed</description>
       <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.42.2.27.8.1.24" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.7" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>pwdMinDelay</alias>
+        <alias>pwdExpireWarning</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.42.2.27.8.1.16" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.6" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>pwdChangedTime</alias>
+        <alias>pwdMinLength</alias>
       </aliases>
-      <description>The time the password was last changed</description>
       <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.42.2.27.8.1.12" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.8" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>pwdFailureCountInterval</alias>
+        <alias>pwdGraceAuthNLimit</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.42.2.27.8.1.6" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.24" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>pwdMinLength</alias>
+        <alias>pwdMinDelay</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.42.2.27.8.1.17" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.1" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>pwdAccountLockedTime</alias>
+        <alias>pwdAttribute</alias>
       </aliases>
-      <description>The time an user account was locked</description>
       <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.38</syntax>
+      <equality>objectIdentifierMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.7" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.26" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>pwdExpireWarning</alias>
+        <alias>pwdMaxIdle</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.42.2.27.8.1.13" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.23" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
       <aliases>
-        <alias>pwdMustChange</alias>
+        <alias>pwdPolicySubentry</alias>
       </aliases>
+      <description>The pwdPolicy subentry in effect for this object</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
-      <equality>booleanMatch</equality>
+      <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.42.2.27.8.1.4" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.17" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
       <aliases>
-        <alias>pwdInHistory</alias>
+        <alias>pwdAccountLockedTime</alias>
       </aliases>
+      <description>The time an user account was locked</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.24</syntax>
+      <equality>generalizedTimeMatch</equality>
+      <ordering>generalizedTimeOrderingMatch</ordering>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.30" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.3" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>pwdGraceExpire</alias>
+        <alias>pwdMaxAge</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.42.2.27.8.1.11" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.12" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>pwdMaxFailure</alias>
+        <alias>pwdFailureCountInterval</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.42.2.27.8.1.1" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.9" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>pwdAttribute</alias>
+        <alias>pwdLockout</alias>
       </aliases>
       <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.7</syntax>
+      <equality>booleanMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.29" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.28" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
       <aliases>
-        <alias>pwdLastSuccess</alias>
+        <alias>pwdEndTime</alias>
       </aliases>
-      <description>The timestamp of the last successful authentication</description>
+      <description>The time the password becomes disabled</description>
       <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.42.2.27.8.1.22" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.13" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>pwdReset</alias>
+        <alias>pwdMustChange</alias>
       </aliases>
-      <description>The indication that the password has been reset</description>
       <usage>USER_APPLICATIONS</usage>
       <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.42.2.27.8.1.19" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
+      <aliases>
+        <alias>pwdFailureTime</alias>
+      </aliases>
+      <description>The timestamps of the last consecutive authentication failures</description>
+      <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.42.2.27.8.1.25" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
         <alias>pwdMaxDelay</alias>
@@ -202,45 +197,49 @@
       <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.42.2.27.8.1.3" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.30" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>pwdMaxAge</alias>
+        <alias>pwdGraceExpire</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.42.2.27.8.1.15" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.20" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
       <aliases>
-        <alias>pwdSafeModify</alias>
+        <alias>pwdHistory</alias>
       </aliases>
+      <description>The history of user s passwords</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
-      <equality>booleanMatch</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.40</syntax>
+      <equality>octetStringMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.2" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.22" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>pwdMinAge</alias>
+        <alias>pwdReset</alias>
       </aliases>
+      <description>The indication that the password has been reset</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.7</syntax>
+      <equality>booleanMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.9" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.15" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>pwdLockout</alias>
+        <alias>pwdSafeModify</alias>
       </aliases>
       <usage>USER_APPLICATIONS</usage>
       <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.42.2.27.8.1.31" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.27" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
       <aliases>
-        <alias>pwdMaxLength</alias>
+        <alias>pwdStartTime</alias>
       </aliases>
+      <description>The time the password becomes enabled</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.24</syntax>
+      <equality>generalizedTimeMatch</equality>
+      <ordering>generalizedTimeOrderingMatch</ordering>
     </attributetype>
     <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.10" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
@@ -250,30 +249,31 @@
       <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.42.2.27.8.1.26" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.14" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>pwdMaxIdle</alias>
+        <alias>pwdAllowUserChange</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.7</syntax>
+      <equality>booleanMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.8" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.2" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>pwdGraceAuthNLimit</alias>
+        <alias>pwdMinAge</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.42.2.27.8.1.21" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
+    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.29" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
       <aliases>
-        <alias>pwdGraceUseTime</alias>
+        <alias>pwdLastSuccess</alias>
       </aliases>
-      <description>The timestamps of the grace authentication after the password has expired</description>
+      <description>The timestamp of the last successful authentication</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
       <equality>generalizedTimeMatch</equality>
+      <ordering>generalizedTimeOrderingMatch</ordering>
     </attributetype>
   </attributetypes>
   <objectclasses>



Mime
View raw message