Fix previous commit

[openldap] / servers / slapd / schema_prep.c

diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index b23d4c364b5a4cbf2fce70df5b7479279dcf9469..6deb5e38f516191b77a46a25480f7db0bbe36015 100644 (file)
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -157,7 +157,7 @@ static struct slap_schema_oc_map {
        { "subentry", "( 2.5.20.0 NAME 'subentry' "
                        "SUP top STRUCTURAL "
                        "MUST ( cn $ subtreeSpecification ) )",
-               subentryObjectClass, 0,
+               subentryObjectClass, SLAP_OC_SUBENTRY,
                offsetof(struct slap_internal_schema, si_oc_subentry) },
        { "subschema", "( 2.5.20.1 NAME 'subschema' "
                "DESC 'RFC2252: controlling subschema (sub)entry' "
@@ -165,18 +165,18 @@ static struct slap_schema_oc_map {
                "MAY ( dITStructureRules $ nameForms $ ditContentRules $ "
                        "objectClasses $ attributeTypes $ matchingRules $ "
                        "matchingRuleUse ) )",
-               subentryObjectClass, SLAP_OC_SUBENTRY,
+               subentryObjectClass, 0,
                offsetof(struct slap_internal_schema, si_oc_subschema) },
        { "monitor", "( 1.3.6.1.4.1.4203.666.3.2 NAME 'monitor' "
                "DESC 'OpenLDAP system monitoring' "
                "STRUCTURAL "
                "MUST cn )",
                0, 0, offsetof(struct slap_internal_schema, si_oc_monitor) },
-       { "collectiveAttributes", "( 2.5.20.2 "
-                       "NAME 'collectiveAttributes' "
+       { "collectiveAttributeSubentry", "( 2.5.20.2 "
+                       "NAME 'collectiveAttributeSubentry' "
                        "AUXILIARY )",
-               subentryObjectClass, SLAP_OC_COLLECTIVEATTRIBUTES,
-               offsetof(struct slap_internal_schema, si_oc_collectiveAttributes) },
+               subentryObjectClass, SLAP_OC_COLLECTIVEATTRIBUTESUBENTRY,
+               offsetof(struct slap_internal_schema, si_oc_collectiveAttributeSubentry) },
        { "dynamicObject", "( 1.3.6.1.4.1.1466.101.119.2 "
                        "NAME 'dynamicObject' "
                        "DESC 'RFC2589: Dynamic Object' "
@@ -263,13 +263,13 @@ static struct slap_schema_ad_map {
                        "SINGLE-VALUE USAGE directoryOperation )",
                NULL, 0, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_subschemaSubentry) },
-       { "collectiveAttributeSubentry", "( 2.5.18.12 "
-                       "NAME 'collectiveAttributeSubentry' "
+       { "collectiveAttributeSubentries", "( 2.5.18.12 "
+                       "NAME 'collectiveAttributeSubentries' "
                        "EQUALITY distinguishedNameMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 "
                        "USAGE directoryOperation NO-USER-MODIFICATION )",
                NULL, 0, NULL, NULL, NULL,
-               offsetof(struct slap_internal_schema, si_ad_collectiveSubentry) },
+               offsetof(struct slap_internal_schema, si_ad_collectiveSubentries) },
        { "collectiveExclusions", "( 2.5.18.7 NAME 'collectiveExclusions' "
                        "EQUALITY objectIdentifierMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 "