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

diff --git a/CHANGES b/CHANGES
index 9ee325a90681925fa3e45e0c223d6432aa51f107..d93c8d3654550a43500152b6c77db83326762f6f 100644 (file)
--- 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 e046c944123bc5ebd8c6175a8705a9e6eca3b67f..04749a1c5132a41bc95c8ca3c21094f8f5e7cfbc 100644 (file)
--- 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 cff6e79f0872753bcf8b2663cfc85cce2ea0646c..7b98bca304d2f574a7ce56c6bd3de75dc56801db 100644 (file)
--- 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 )