From: Pierangelo Masarati <ando@openldap.org>
Date: Mon, 8 Oct 2007 10:39:32 +0000 (+0000)
Subject: fix ordering of items on objectClass definition (ITS#5174)
X-Git-Tag: OPENLDAP_REL_ENG_2_4_6~56
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=16403dbeb13152132d206a979b8a082a71fe561e;p=openldap

fix ordering of items on objectClass definition (ITS#5174)
---

diff --git a/CHANGES b/CHANGES
index 9ee325a906..d93c8d3654 100644
--- a/CHANGES
+++ b/CHANGES
@@ -25,6 +25,7 @@ OpenLDAP 2.4.6 Engineering
         Fixed slapo-pcache sizelimit handling (ITS#5114)
 	Fixed slapo-rwm modlist handling (ITS#5124)
 	Fixed slapo-rwm UUID in filter (ITS#5168)
+	Fixed openldap.schema sequence in objectClass definition (ITS#5174)
 	Build Environment
 		Use separate config OID arc for contrib (ITS#5158)
                 Updated contrib/ldapc++ build enviroment
diff --git a/servers/slapd/schema/openldap.ldif b/servers/slapd/schema/openldap.ldif
index e046c94412..04749a1c51 100644
--- a/servers/slapd/schema/openldap.ldif
+++ b/servers/slapd/schema/openldap.ldif
@@ -84,4 +84,5 @@ olcObjectClasses: ( OpenLDAPobjectClass:5
 olcObjectClasses: ( OpenLDAPobjectClass:6
   NAME 'OpenLDAPdisplayableObject'
   DESC 'OpenLDAP Displayable Object'
-  MAY displayName AUXILIARY )
+  AUXILIARY
+  MAY displayName )
diff --git a/servers/slapd/schema/openldap.schema b/servers/slapd/schema/openldap.schema
index cff6e79f08..7b98bca304 100644
--- a/servers/slapd/schema/openldap.schema
+++ b/servers/slapd/schema/openldap.schema
@@ -50,4 +50,5 @@ objectClass ( OpenLDAPobjectClass:5
 objectClass ( OpenLDAPobjectClass:6
 	NAME 'OpenLDAPdisplayableObject'
 	DESC 'OpenLDAP Displayable Object'
-	MAY displayName AUXILIARY )
+	AUXILIARY
+	MAY displayName )