Return-Path: 
 <commits-return-33095-apmail-directory-commits-archive=directory.apache.org@directory.apache.org>
X-Original-To: apmail-directory-commits-archive@www.apache.org
Delivered-To: apmail-directory-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 5E86A95E9
	for <apmail-directory-commits-archive@www.apache.org>;
 Wed, 14 Dec 2011 15:21:41 +0000 (UTC)
Received: (qmail 67870 invoked by uid 500); 14 Dec 2011 15:21:41 -0000
Delivered-To: apmail-directory-commits-archive@directory.apache.org
Received: (qmail 67830 invoked by uid 500); 14 Dec 2011 15:21:41 -0000
Mailing-List: contact commits-help@directory.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@directory.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@directory.apache.org>
List-Post: <mailto:commits@directory.apache.org>
List-Id: <commits.directory.apache.org>
Reply-To: dev@directory.apache.org
Delivered-To: mailing list commits@directory.apache.org
Received: (qmail 67823 invoked by uid 99); 14 Dec 2011 15:21:41 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Dec 2011 15:21:41 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Dec 2011 15:21:29 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 63C492388B43
	for <commits@directory.apache.org>; Wed, 14 Dec 2011 15:20:43 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1214294 [8/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 -0000
To: commits@directory.apache.org
From: pamarcelot@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111214152043.63C492388B43@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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=1214294&r1=1214293&r2=1214294&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/nis.xml (original)
+++ directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/nis.xml Wed Dec 14 15:20:41 2011
@@ -19,10 +19,20 @@
 -->
 <schema name="nis">
   <attributetypes>
-    <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.0" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>shadowMin</alias>
+        <alias>uidNumber</alias>
+      </aliases>
+      <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>
+    </attributetype>
+    <attributetype oid="1.3.6.1.1.1.1.1" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+      <aliases>
+        <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>
@@ -35,167 +45,161 @@
       <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.18" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.1.1.1.11" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>oncRpcNumber</alias>
+        <alias>shadowFlag</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.19" 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>ipHostNumber</alias>
+        <alias>memberUid</alias>
       </aliases>
-      <description>IP address</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseIgnoreIA5Match</equality>
+      <equality>caseExactIA5Match</equality>
+      <substring>caseExactIA5SubstringsMatch</substring>
     </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.13" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>shadowMax</alias>
+        <alias>memberNisNetgroup</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.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">
+    <attributetype oid="1.3.6.1.1.1.1.14" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>nisMapName</alias>
+        <alias>nisNetgroupTriple</alias>
       </aliases>
-      <superior>name</superior>
+      <description>Netgroup triple</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.1.1.0.0</syntax>
     </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.15" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>shadowWarning</alias>
+        <alias>ipServicePort</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.16" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>memberNisNetgroup</alias>
+        <alias>ipServiceProtocol</alias>
       </aliases>
+      <superior>name</superior>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseExactIA5Match</equality>
-      <substring>caseExactIA5SubstringsMatch</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.1.1.1.20" 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>ipNetworkNumber</alias>
+        <alias>ipProtocolNumber</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>
+      <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.18" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>shadowInactive</alias>
+        <alias>oncRpcNumber</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.27" 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>nisMapEntry</alias>
+        <alias>ipHostNumber</alias>
       </aliases>
+      <description>IP address</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseExactIA5Match</equality>
-      <substring>caseExactIA5SubstringsMatch</substring>
+      <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.2" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>uidNumber</alias>
+        <alias>gecos</alias>
       </aliases>
-      <description>An integer uniquely identifying a user in an administrative domain</description>
+      <description>The GECOS field; the common name</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>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.20" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>memberUid</alias>
+        <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>caseExactIA5Match</equality>
-      <substring>caseExactIA5SubstringsMatch</substring>
+      <equality>caseIgnoreIA5Match</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.21" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>macAddress</alias>
+        <alias>ipNetmaskNumber</alias>
       </aliases>
-      <description>MAC 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.3" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.1.1.1.22" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>homeDirectory</alias>
+        <alias>macAddress</alias>
       </aliases>
-      <description>The absolute path to the home directory</description>
+      <description>MAC 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.1" 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>gidNumber</alias>
+        <alias>bootParameter</alias>
       </aliases>
-      <description>An integer uniquely identifying a group in an administrative domain</description>
+      <description>rpc.bootparamd parameter</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.1.1.0.1</syntax>
     </attributetype>
-    <attributetype oid="1.3.6.1.1.1.1.14" 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>nisNetgroupTriple</alias>
+        <alias>bootFile</alias>
       </aliases>
-      <description>Netgroup triple</description>
+      <description>Boot image name</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.1.1.0.0</syntax>
+      <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">
+    <attributetype oid="1.3.6.1.1.1.1.26" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>ipServicePort</alias>
+        <alias>nisMapName</alias>
       </aliases>
+      <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.21" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.1.1.1.27" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>ipNetmaskNumber</alias>
+        <alias>nisMapEntry</alias>
       </aliases>
-      <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.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>
+      <equality>caseExactIA5Match</equality>
+      <substring>caseExactIA5SubstringsMatch</substring>
     </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.3" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>bootFile</alias>
+        <alias>homeDirectory</alias>
       </aliases>
-      <description>Boot image name</description>
+      <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>
@@ -209,45 +213,41 @@
       <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.23" 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>bootParameter</alias>
+        <alias>shadowLastChange</alias>
       </aliases>
-      <description>rpc.bootparamd parameter</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.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.6" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>ipServiceProtocol</alias>
+        <alias>shadowMin</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.2" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.1.1.1.7" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>gecos</alias>
+        <alias>shadowMax</alias>
       </aliases>
-      <description>The GECOS field; the common name</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseIgnoreIA5Match</equality>
-      <substring>caseIgnoreIA5SubstringsMatch</substring>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.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.8" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>shadowLastChange</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.11" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.1.1.1.9" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>shadowFlag</alias>
+        <alias>shadowInactive</alias>
       </aliases>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
@@ -278,25 +278,61 @@
         <attributetype>description</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="1.3.6.1.1.1.2.2" obsolete="false">
+    <objectclass oid="1.3.6.1.1.1.2.1" obsolete="false">
       <aliases>
-        <alias>posixGroup</alias>
+        <alias>shadowAccount</alias>
       </aliases>
-      <description>Abstraction of a group of accounts</description>
+      <description>Additional attributes for shadow passwords</description>
+      <superiors>
+        <superior>top</superior>
+      </superiors>
+      <type>AUXILIARY</type>
+      <mandatory>
+        <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.10" obsolete="false">
+      <aliases>
+        <alias>nisObject</alias>
+      </aliases>
+      <description>An entry in a NIS map</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
         <attributetype>cn</attributetype>
-        <attributetype>gidNumber</attributetype>
+        <attributetype>nisMapEntry</attributetype>
+        <attributetype>nisMapName</attributetype>
       </mandatory>
       <optional>
-        <attributetype>userPassword</attributetype>
-        <attributetype>memberUid</attributetype>
         <attributetype>description</attributetype>
       </optional>
     </objectclass>
+    <objectclass oid="1.3.6.1.1.1.2.11" obsolete="false">
+      <aliases>
+        <alias>ieee802Device</alias>
+      </aliases>
+      <description>A device with a MAC address</description>
+      <superiors>
+        <superior>top</superior>
+      </superiors>
+      <type>AUXILIARY</type>
+      <optional>
+        <attributetype>macAddress</attributetype>
+      </optional>
+    </objectclass>
     <objectclass oid="1.3.6.1.1.1.2.12" obsolete="false">
       <aliases>
         <alias>bootableDevice</alias>
@@ -311,54 +347,55 @@
         <attributetype>bootParameter</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.3" obsolete="false">
       <aliases>
-        <alias>ipProtocol</alias>
+        <alias>ipService</alias>
       </aliases>
-      <description>Abstraction of an IP protocol</description>
+      <description>Abstraction an Internet Protocol service</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
         <attributetype>cn</attributetype>
-        <attributetype>ipProtocolNumber</attributetype>
+        <attributetype>ipServicePort</attributetype>
+        <attributetype>ipServiceProtocol</attributetype>
       </mandatory>
       <optional>
         <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.4" obsolete="false">
       <aliases>
-        <alias>nisObject</alias>
+        <alias>ipProtocol</alias>
       </aliases>
-      <description>An entry in a NIS map</description>
+      <description>Abstraction of an IP protocol</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
         <attributetype>cn</attributetype>
-        <attributetype>nisMapEntry</attributetype>
-        <attributetype>nisMapName</attributetype>
+        <attributetype>ipProtocolNumber</attributetype>
       </mandatory>
       <optional>
         <attributetype>description</attributetype>
@@ -400,19 +437,6 @@
         <attributetype>manager</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="1.3.6.1.1.1.2.11" obsolete="false">
-      <aliases>
-        <alias>ieee802Device</alias>
-      </aliases>
-      <description>A device with a MAC address</description>
-      <superiors>
-        <superior>top</superior>
-      </superiors>
-      <type>AUXILIARY</type>
-      <optional>
-        <attributetype>macAddress</attributetype>
-      </optional>
-    </objectclass>
     <objectclass oid="1.3.6.1.1.1.2.7" obsolete="false">
       <aliases>
         <alias>ipNetwork</alias>
@@ -451,30 +475,6 @@
         <attributetype>description</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="1.3.6.1.1.1.2.1" obsolete="false">
-      <aliases>
-        <alias>shadowAccount</alias>
-      </aliases>
-      <description>Additional attributes for shadow passwords</description>
-      <superiors>
-        <superior>top</superior>
-      </superiors>
-      <type>AUXILIARY</type>
-      <mandatory>
-        <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.9" obsolete="false">
       <aliases>
         <alias>nisMap</alias>
@@ -501,11 +501,11 @@
     </matchingrule>
   </matchingrules>
   <syntaxes>
-    <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>
+    <syntax oid="1.3.6.1.1.1.0.1" obsolete="false" humanreadable="true">
+      <description>NIS Boot Parameter</description>
+    </syntax>
   </syntaxes>
 </schema>

Added: 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=1214294&view=auto
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/pwdpolicy.xml (added)
+++ directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/pwdpolicy.xml Wed Dec 14 15:20:41 2011
@@ -0,0 +1,315 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<schema name="pwdpolicy">
+  <attributetypes>
+    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.1" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+      <aliases>
+        <alias>pwdAttribute</alias>
+      </aliases>
+      <usage>USER_APPLICATIONS</usage>
+      <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.10" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+      <aliases>
+        <alias>pwdLockoutDuration</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">
+      <aliases>
+        <alias>pwdMaxFailure</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.12" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+      <aliases>
+        <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.13" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+      <aliases>
+        <alias>pwdMustChange</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.14" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+      <aliases>
+        <alias>pwdAllowUserChange</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.15" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+      <aliases>
+        <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.16" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+      <aliases>
+        <alias>pwdChangedTime</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>
+    </attributetype>
+    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.17" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+      <aliases>
+        <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.24</syntax>
+      <equality>generalizedTimeMatch</equality>
+      <ordering>generalizedTimeOrderingMatch</ordering>
+    </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.2" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+      <aliases>
+        <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.20" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
+      <aliases>
+        <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.40</syntax>
+      <equality>octetStringMatch</equality>
+    </attributetype>
+    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.21" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
+      <aliases>
+        <alias>pwdGraceUseTime</alias>
+      </aliases>
+      <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>
+    </attributetype>
+    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.22" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+      <aliases>
+        <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.7</syntax>
+      <equality>booleanMatch</equality>
+    </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.24" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+      <aliases>
+        <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.25" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+      <aliases>
+        <alias>pwdMaxDelay</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.26" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+      <aliases>
+        <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.27" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+      <aliases>
+        <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.24</syntax>
+      <equality>generalizedTimeMatch</equality>
+      <ordering>generalizedTimeOrderingMatch</ordering>
+    </attributetype>
+    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.28" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+      <aliases>
+        <alias>pwdEndTime</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>
+    </attributetype>
+    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.29" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+      <aliases>
+        <alias>pwdLastSuccess</alias>
+      </aliases>
+      <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>
+    <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.3" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+      <aliases>
+        <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.30" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+      <aliases>
+        <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.31" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+      <aliases>
+        <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.4" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+      <aliases>
+        <alias>pwdInHistory</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.5" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+      <aliases>
+        <alias>pwdCheckQuality</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">
+      <aliases>
+        <alias>pwdMinLength</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.7" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+      <aliases>
+        <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.8" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+      <aliases>
+        <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.9" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+      <aliases>
+        <alias>pwdLockout</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.42.2.27.8.2.1" obsolete="false">
+      <aliases>
+        <alias>pwdPolicy</alias>
+      </aliases>
+      <description>class to hold the PasswordPolicy parameters</description>
+      <superiors>
+        <superior>top</superior>
+      </superiors>
+      <type>AUXILIARY</type>
+      <mandatory>
+        <attributetype>pwdAttribute</attributetype>
+      </mandatory>
+      <optional>
+        <attributetype>pwdMinAge</attributetype>
+        <attributetype>pwdMaxAge</attributetype>
+        <attributetype>pwdInHistory</attributetype>
+        <attributetype>pwdCheckQuality</attributetype>
+        <attributetype>pwdMinLength</attributetype>
+        <attributetype>pwdMaxLength</attributetype>
+        <attributetype>pwdExpireWarning</attributetype>
+        <attributetype>pwdGraceAuthNLimit</attributetype>
+        <attributetype>pwdGraceExpire</attributetype>
+        <attributetype>pwdLockout</attributetype>
+        <attributetype>pwdLockoutDuration</attributetype>
+        <attributetype>pwdMaxFailure</attributetype>
+        <attributetype>pwdFailureCountInterval</attributetype>
+        <attributetype>pwdMustChange</attributetype>
+        <attributetype>pwdAllowUserChange</attributetype>
+        <attributetype>pwdSafeModify</attributetype>
+        <attributetype>pwdMinDelay</attributetype>
+        <attributetype>pwdMaxDelay</attributetype>
+        <attributetype>pwdMaxIdle</attributetype>
+      </optional>
+    </objectclass>
+  </objectclasses>
+</schema>

Modified: directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/samba.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/samba.xml?rev=1214294&r1=1214293&r2=1214294&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/samba.xml (original)
+++ directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/samba.xml Wed Dec 14 15:20:41 2011
@@ -19,85 +19,68 @@
 -->
 <schema name="samba">
   <attributetypes>
-    <attributetype oid="1.3.6.1.4.1.7165.2.1.48" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.7165.2.1.19" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>sambaBadPasswordCount</alias>
+        <alias>sambaGroupType</alias>
       </aliases>
-      <description>Bad password attempt count</description>
+      <description>NT Group Type</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.4.1.7165.2.1.44" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.7165.2.1.20" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>sambaIntegerOption</alias>
+        <alias>sambaSID</alias>
       </aliases>
-      <description>An integer option</description>
+      <description>Security ID</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>caseIgnoreIA5Match</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.7165.2.1.35" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.7165.2.1.21" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>sambaProfilePath</alias>
+        <alias>sambaNextUserRid</alias>
       </aliases>
-      <description>Roaming profile path</description>
+      <description>Next NT rid to give our for users</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
-      <equality>caseIgnoreMatch</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+      <equality>integerMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.7165.2.1.34" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.7165.2.1.22" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>sambaLogonScript</alias>
+        <alias>sambaNextGroupRid</alias>
       </aliases>
-      <description>Logon script path</description>
+      <description>Next NT rid to give out for groups</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
-      <equality>caseIgnoreMatch</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+      <equality>integerMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.7165.2.1.51" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.7165.2.1.23" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>sambaSIDList</alias>
+        <alias>sambaPrimaryGroupSID</alias>
       </aliases>
-      <description>Security ID List</description>
+      <description>Primary Group Security ID</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.4.1.7165.2.1.47" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
-      <aliases>
-        <alias>sambaMungedDial</alias>
-      </aliases>
-      <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.7165.2.1.43" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
-      <aliases>
-        <alias>sambaBoolOption</alias>
-      </aliases>
-      <description>A boolean option</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.7165.2.1.38" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.7165.2.1.24" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>sambaDomainName</alias>
+        <alias>sambaLMPassword</alias>
       </aliases>
-      <description>Windows NT domain to which the user belongs</description>
+      <description>LanManager Password</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
-      <equality>caseIgnoreMatch</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+      <equality>caseIgnoreIA5Match</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.7165.2.1.19" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.7165.2.1.25" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>sambaGroupType</alias>
+        <alias>sambaNTPassword</alias>
       </aliases>
-      <description>NT Group Type</description>
+      <description>MD4 hash of the unicode password</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>caseIgnoreIA5Match</equality>
     </attributetype>
     <attributetype oid="1.3.6.1.4.1.7165.2.1.26" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
@@ -108,38 +91,29 @@
       <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
       <equality>caseIgnoreIA5Match</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.7165.2.1.22" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.7165.2.1.27" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>sambaNextGroupRid</alias>
+        <alias>sambaPwdLastSet</alias>
       </aliases>
-      <description>Next NT rid to give out for groups</description>
+      <description>Timestamp of the last password update</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.4.1.7165.2.1.31" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.7165.2.1.28" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>sambaLogoffTime</alias>
+        <alias>sambaPwdCanChange</alias>
       </aliases>
-      <description>Timestamp of last logoff</description>
+      <description>Timestamp of when the user is allowed to update the password</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.4.1.7165.2.1.25" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
-      <aliases>
-        <alias>sambaNTPassword</alias>
-      </aliases>
-      <description>MD4 hash of the unicode password</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.4.1.7165.2.1.21" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.7165.2.1.29" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>sambaNextUserRid</alias>
+        <alias>sambaPwdMustChange</alias>
       </aliases>
-      <description>Next NT rid to give our for users</description>
+      <description>Timestamp of when the password will expire</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
       <equality>integerMatch</equality>
@@ -153,92 +127,101 @@
       <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.7165.2.1.40" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.7165.2.1.31" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>sambaAlgorithmicRidBase</alias>
+        <alias>sambaLogoffTime</alias>
       </aliases>
-      <description>Base at which the samba RID generation algorithm should operate</description>
+      <description>Timestamp of last logoff</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.4.1.7165.2.1.28" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.7165.2.1.32" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>sambaPwdCanChange</alias>
+        <alias>sambaKickoffTime</alias>
       </aliases>
-      <description>Timestamp of when the user is allowed to update the password</description>
+      <description>Timestamp of when the user will be logged off automatically</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.4.1.7165.2.1.24" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.7165.2.1.33" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>sambaLMPassword</alias>
+        <alias>sambaHomeDrive</alias>
       </aliases>
-      <description>LanManager Password</description>
+      <description>Driver letter of home directory mapping</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.4.1.7165.2.1.41" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.7165.2.1.34" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>sambaShareName</alias>
+        <alias>sambaLogonScript</alias>
       </aliases>
-      <description>Share Name</description>
+      <description>Logon script path</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
       <equality>caseIgnoreMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.7165.2.1.55" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.7165.2.1.35" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>sambaLogonHours</alias>
+        <alias>sambaProfilePath</alias>
       </aliases>
-      <description>Logon Hours</description>
+      <description>Roaming profile path</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseIgnoreIA5Match</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+      <equality>caseIgnoreMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.7165.2.1.33" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.7165.2.1.36" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>sambaHomeDrive</alias>
+        <alias>sambaUserWorkstations</alias>
       </aliases>
-      <description>Driver letter of home directory mapping</description>
+      <description>List of user workstations the user is allowed to logon to</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseIgnoreIA5Match</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+      <equality>caseIgnoreMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.7165.2.1.27" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.7165.2.1.37" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>sambaPwdLastSet</alias>
+        <alias>sambaHomePath</alias>
       </aliases>
-      <description>Timestamp of the last password update</description>
+      <description>Home directory UNC path</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.15</syntax>
+      <equality>caseIgnoreMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.7165.2.1.23" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.7165.2.1.38" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>sambaPrimaryGroupSID</alias>
+        <alias>sambaDomainName</alias>
       </aliases>
-      <description>Primary Group Security ID</description>
+      <description>Windows NT domain to which the user belongs</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseIgnoreIA5Match</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+      <equality>caseIgnoreMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.7165.2.1.37" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.7165.2.1.39" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>sambaHomePath</alias>
+        <alias>sambaNextRid</alias>
       </aliases>
-      <description>Home directory UNC path</description>
+      <description>Next NT rid to give out for anything</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
-      <equality>caseIgnoreMatch</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+      <equality>integerMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.7165.2.1.46" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.7165.2.1.40" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>sambaStringListOption</alias>
+        <alias>sambaAlgorithmicRidBase</alias>
       </aliases>
-      <description>A string list option</description>
+      <description>Base at which the samba RID generation algorithm should operate</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.4.1.7165.2.1.41" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+      <aliases>
+        <alias>sambaShareName</alias>
+      </aliases>
+      <description>Share Name</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
       <equality>caseIgnoreMatch</equality>
@@ -253,65 +236,64 @@
       <equality>caseIgnoreMatch</equality>
       <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.7165.2.1.54" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.7165.2.1.43" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>sambaPasswordHistory</alias>
+        <alias>sambaBoolOption</alias>
       </aliases>
-      <description>Concatenated MD4 hashes of the unicode passwords used on this account</description>
+      <description>A boolean option</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.7</syntax>
+      <equality>booleanMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.7165.2.1.32" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.7165.2.1.44" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>sambaKickoffTime</alias>
+        <alias>sambaIntegerOption</alias>
       </aliases>
-      <description>Timestamp of when the user will be logged off automatically</description>
+      <description>An integer option</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.4.1.7165.2.1.53" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.7165.2.1.45" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>sambaTrustFlags</alias>
+        <alias>sambaStringOption</alias>
       </aliases>
-      <description>Trust Password Flags</description>
+      <description>A string option</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseIgnoreIA5Match</equality>
+      <equality>caseExactIA5Match</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.7165.2.1.36" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.7165.2.1.46" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>sambaUserWorkstations</alias>
+        <alias>sambaStringListOption</alias>
       </aliases>
-      <description>List of user workstations the user is allowed to logon to</description>
+      <description>A string list option</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
       <equality>caseIgnoreMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.7165.2.1.45" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.7165.2.1.47" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>sambaStringOption</alias>
+        <alias>sambaMungedDial</alias>
       </aliases>
-      <description>A string option</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.7165.2.1.20" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.7165.2.1.48" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>sambaSID</alias>
+        <alias>sambaBadPasswordCount</alias>
       </aliases>
-      <description>Security ID</description>
+      <description>Bad password attempt count</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseIgnoreIA5Match</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+      <equality>integerMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.7165.2.1.29" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.7165.2.1.49" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>sambaPwdMustChange</alias>
+        <alias>sambaBadPasswordTime</alias>
       </aliases>
-      <description>Timestamp of when the password will expire</description>
+      <description>Time of the last bad password attempt</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
       <equality>integerMatch</equality>
@@ -326,125 +308,99 @@
       <equality>caseIgnoreMatch</equality>
       <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.7165.2.1.49" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.7165.2.1.51" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>sambaBadPasswordTime</alias>
+        <alias>sambaSIDList</alias>
       </aliases>
-      <description>Time of the last bad password attempt</description>
+      <description>Security ID List</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>caseIgnoreIA5Match</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.7165.2.1.39" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.7165.2.1.52" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>sambaNextRid</alias>
+        <alias>sambaPrivilegeList</alias>
       </aliases>
-      <description>Next NT rid to give out for anything</description>
+      <description>Privileges List</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>caseIgnoreIA5Match</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.7165.2.1.52" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.7165.2.1.53" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>sambaPrivilegeList</alias>
+        <alias>sambaTrustFlags</alias>
       </aliases>
-      <description>Privileges List</description>
+      <description>Trust Password Flags</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
       <equality>caseIgnoreIA5Match</equality>
     </attributetype>
-  </attributetypes>
-  <objectclasses>
-    <objectclass oid="1.3.6.1.4.1.7165.2.2.5" obsolete="false">
+    <attributetype oid="1.3.6.1.4.1.7165.2.1.54" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>sambaDomain</alias>
+        <alias>sambaPasswordHistory</alias>
       </aliases>
-      <description>Samba Domain Information</description>
-      <superiors>
-        <superior>top</superior>
-      </superiors>
-      <type>STRUCTURAL</type>
-      <mandatory>
-        <attributetype>sambaDomainName</attributetype>
-        <attributetype>sambaSID</attributetype>
-      </mandatory>
-      <optional>
-        <attributetype>sambaNextRid</attributetype>
-        <attributetype>sambaNextGroupRid</attributetype>
-        <attributetype>sambaNextUserRid</attributetype>
-        <attributetype>sambaAlgorithmicRidBase</attributetype>
-      </optional>
-    </objectclass>
-    <objectclass oid="1.3.6.1.4.1.7165.2.2.8" obsolete="false">
+      <description>Concatenated MD4 hashes of the unicode passwords used on this account</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.4.1.7165.2.1.55" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>sambaIdmapEntry</alias>
+        <alias>sambaLogonHours</alias>
       </aliases>
-      <description>Mapping from a SID to an ID</description>
+      <description>Logon Hours</description>
+      <usage>USER_APPLICATIONS</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+      <equality>caseIgnoreIA5Match</equality>
+    </attributetype>
+  </attributetypes>
+  <objectclasses>
+    <objectclass oid="1.3.6.1.4.1.7165.1.2.2.10" obsolete="false">
+      <aliases>
+        <alias>sambaConfig</alias>
+      </aliases>
+      <description>Samba Configuration Section</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>AUXILIARY</type>
-      <mandatory>
-        <attributetype>sambaSID</attributetype>
-      </mandatory>
       <optional>
-        <attributetype>uidNumber</attributetype>
-        <attributetype>gidNumber</attributetype>
+        <attributetype>description</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="1.3.6.1.4.1.7165.2.2.6" obsolete="false">
+    <objectclass oid="1.3.6.1.4.1.7165.2.2.11" obsolete="false">
       <aliases>
-        <alias>sambaSamAccount</alias>
+        <alias>sambaShare</alias>
       </aliases>
-      <description>Samba 3.0 Auxilary SAM Account</description>
+      <description>Samba Share Section</description>
       <superiors>
         <superior>top</superior>
       </superiors>
-      <type>AUXILIARY</type>
+      <type>STRUCTURAL</type>
       <mandatory>
-        <attributetype>uid</attributetype>
-        <attributetype>sambaSID</attributetype>
+        <attributetype>sambaShareName</attributetype>
       </mandatory>
       <optional>
-        <attributetype>cn</attributetype>
-        <attributetype>sambaLMPassword</attributetype>
-        <attributetype>sambaNTPassword</attributetype>
-        <attributetype>sambaPwdLastSet</attributetype>
-        <attributetype>sambaLogonTime</attributetype>
-        <attributetype>sambaLogoffTime</attributetype>
-        <attributetype>sambaKickoffTime</attributetype>
-        <attributetype>sambaPwdCanChange</attributetype>
-        <attributetype>sambaPwdMustChange</attributetype>
-        <attributetype>sambaAcctFlags</attributetype>
-        <attributetype>displayName</attributetype>
-        <attributetype>sambaHomePath</attributetype>
-        <attributetype>sambaHomeDrive</attributetype>
-        <attributetype>sambaLogonScript</attributetype>
-        <attributetype>sambaProfilePath</attributetype>
         <attributetype>description</attributetype>
-        <attributetype>sambaUserWorkstations</attributetype>
-        <attributetype>sambaPrimaryGroupSID</attributetype>
-        <attributetype>sambaDomainName</attributetype>
-        <attributetype>sambaMungedDial</attributetype>
-        <attributetype>sambaBadPasswordCount</attributetype>
-        <attributetype>sambaBadPasswordTime</attributetype>
-        <attributetype>sambaPasswordHistory</attributetype>
-        <attributetype>sambaLogonHours</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="1.3.6.1.4.1.7165.2.2.11" obsolete="false">
+    <objectclass oid="1.3.6.1.4.1.7165.2.2.12" obsolete="false">
       <aliases>
-        <alias>sambaShare</alias>
+        <alias>sambaConfigOption</alias>
       </aliases>
-      <description>Samba Share Section</description>
+      <description>Samba Configuration Option</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
-        <attributetype>sambaShareName</attributetype>
+        <attributetype>sambaOptionName</attributetype>
       </mandatory>
       <optional>
+        <attributetype>sambaBoolOption</attributetype>
+        <attributetype>sambaIntegerOption</attributetype>
+        <attributetype>sambaStringOption</attributetype>
+        <attributetype>sambaStringListOption</attributetype>
         <attributetype>description</attributetype>
       </optional>
     </objectclass>
@@ -464,70 +420,103 @@
         <attributetype>sambaPrivilegeList</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="1.3.6.1.4.1.7165.2.2.9" obsolete="false">
+    <objectclass oid="1.3.6.1.4.1.7165.2.2.14" obsolete="false">
       <aliases>
-        <alias>sambaSidEntry</alias>
+        <alias>sambaTrustPassword</alias>
       </aliases>
-      <description>Structural Class for a SID</description>
+      <description>Samba Trust Password</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
-        <attributetype>sambaSID</attributetype>
+        <attributetype>sambaDomainName</attributetype>
+        <attributetype>sambaNTPassword</attributetype>
+        <attributetype>sambaTrustFlags</attributetype>
       </mandatory>
+      <optional>
+        <attributetype>sambaSID</attributetype>
+        <attributetype>sambaPwdLastSet</attributetype>
+      </optional>
     </objectclass>
-    <objectclass oid="1.3.6.1.4.1.7165.2.2.12" obsolete="false">
+    <objectclass oid="1.3.6.1.4.1.7165.2.2.4" obsolete="false">
       <aliases>
-        <alias>sambaConfigOption</alias>
+        <alias>sambaGroupMapping</alias>
       </aliases>
-      <description>Samba Configuration Option</description>
+      <description>Samba Group Mapping</description>
       <superiors>
         <superior>top</superior>
       </superiors>
-      <type>STRUCTURAL</type>
+      <type>AUXILIARY</type>
       <mandatory>
-        <attributetype>sambaOptionName</attributetype>
+        <attributetype>gidNumber</attributetype>
+        <attributetype>sambaSID</attributetype>
+        <attributetype>sambaGroupType</attributetype>
       </mandatory>
       <optional>
-        <attributetype>sambaBoolOption</attributetype>
-        <attributetype>sambaIntegerOption</attributetype>
-        <attributetype>sambaStringOption</attributetype>
-        <attributetype>sambaStringListOption</attributetype>
+        <attributetype>displayName</attributetype>
         <attributetype>description</attributetype>
+        <attributetype>sambaSIDList</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="1.3.6.1.4.1.7165.1.2.2.10" obsolete="false">
+    <objectclass oid="1.3.6.1.4.1.7165.2.2.5" obsolete="false">
       <aliases>
-        <alias>sambaConfig</alias>
+        <alias>sambaDomain</alias>
       </aliases>
-      <description>Samba Configuration Section</description>
+      <description>Samba Domain Information</description>
       <superiors>
         <superior>top</superior>
       </superiors>
-      <type>AUXILIARY</type>
+      <type>STRUCTURAL</type>
+      <mandatory>
+        <attributetype>sambaDomainName</attributetype>
+        <attributetype>sambaSID</attributetype>
+      </mandatory>
       <optional>
-        <attributetype>description</attributetype>
+        <attributetype>sambaNextRid</attributetype>
+        <attributetype>sambaNextGroupRid</attributetype>
+        <attributetype>sambaNextUserRid</attributetype>
+        <attributetype>sambaAlgorithmicRidBase</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="1.3.6.1.4.1.7165.2.2.4" obsolete="false">
+    <objectclass oid="1.3.6.1.4.1.7165.2.2.6" obsolete="false">
       <aliases>
-        <alias>sambaGroupMapping</alias>
+        <alias>sambaSamAccount</alias>
       </aliases>
-      <description>Samba Group Mapping</description>
+      <description>Samba 3.0 Auxilary SAM Account</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>AUXILIARY</type>
       <mandatory>
-        <attributetype>gidNumber</attributetype>
+        <attributetype>uid</attributetype>
         <attributetype>sambaSID</attributetype>
-        <attributetype>sambaGroupType</attributetype>
       </mandatory>
       <optional>
+        <attributetype>cn</attributetype>
+        <attributetype>sambaLMPassword</attributetype>
+        <attributetype>sambaNTPassword</attributetype>
+        <attributetype>sambaPwdLastSet</attributetype>
+        <attributetype>sambaLogonTime</attributetype>
+        <attributetype>sambaLogoffTime</attributetype>
+        <attributetype>sambaKickoffTime</attributetype>
+        <attributetype>sambaPwdCanChange</attributetype>
+        <attributetype>sambaPwdMustChange</attributetype>
+        <attributetype>sambaAcctFlags</attributetype>
         <attributetype>displayName</attributetype>
+        <attributetype>sambaHomePath</attributetype>
+        <attributetype>sambaHomeDrive</attributetype>
+        <attributetype>sambaLogonScript</attributetype>
+        <attributetype>sambaProfilePath</attributetype>
         <attributetype>description</attributetype>
-        <attributetype>sambaSIDList</attributetype>
+        <attributetype>sambaUserWorkstations</attributetype>
+        <attributetype>sambaPrimaryGroupSID</attributetype>
+        <attributetype>sambaDomainName</attributetype>
+        <attributetype>sambaMungedDial</attributetype>
+        <attributetype>sambaBadPasswordCount</attributetype>
+        <attributetype>sambaBadPasswordTime</attributetype>
+        <attributetype>sambaPasswordHistory</attributetype>
+        <attributetype>sambaLogonHours</attributetype>
       </optional>
     </objectclass>
     <objectclass oid="1.3.6.1.4.1.7165.2.2.7" obsolete="false">
@@ -544,24 +533,35 @@
         <attributetype>gidNumber</attributetype>
       </mandatory>
     </objectclass>
-    <objectclass oid="1.3.6.1.4.1.7165.2.2.14" obsolete="false">
+    <objectclass oid="1.3.6.1.4.1.7165.2.2.8" obsolete="false">
       <aliases>
-        <alias>sambaTrustPassword</alias>
+        <alias>sambaIdmapEntry</alias>
       </aliases>
-      <description>Samba Trust Password</description>
+      <description>Mapping from a SID to an ID</description>
       <superiors>
         <superior>top</superior>
       </superiors>
-      <type>STRUCTURAL</type>
+      <type>AUXILIARY</type>
       <mandatory>
-        <attributetype>sambaDomainName</attributetype>
-        <attributetype>sambaNTPassword</attributetype>
-        <attributetype>sambaTrustFlags</attributetype>
+        <attributetype>sambaSID</attributetype>
       </mandatory>
       <optional>
-        <attributetype>sambaSID</attributetype>
-        <attributetype>sambaPwdLastSet</attributetype>
+        <attributetype>uidNumber</attributetype>
+        <attributetype>gidNumber</attributetype>
       </optional>
     </objectclass>
+    <objectclass oid="1.3.6.1.4.1.7165.2.2.9" obsolete="false">
+      <aliases>
+        <alias>sambaSidEntry</alias>
+      </aliases>
+      <description>Structural Class for a SID</description>
+      <superiors>
+        <superior>top</superior>
+      </superiors>
+      <type>STRUCTURAL</type>
+      <mandatory>
+        <attributetype>sambaSID</attributetype>
+      </mandatory>
+    </objectclass>
   </objectclasses>
 </schema>