ITS#4764 - Use case consistent with RFCs

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index fc126f127fa8e567128bbc85dad715a61cd1894e..7976a90be8a461e340a9b07f5545194eab80d4d1 100644 (file)
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -3525,13 +3525,13 @@ char *directoryStringSyntaxes[] = {
 };
 char *integerFirstComponentMatchSyntaxes[] = {
        "1.3.6.1.4.1.1466.115.121.1.27" /* INTEGER */,
-       "1.3.6.1.4.1.1466.115.121.1.17" /* ditStructureRuleDescription */,
+       "1.3.6.1.4.1.1466.115.121.1.17" /* dITStructureRuleDescription */,
        NULL
 };
 char *objectIdentifierFirstComponentMatchSyntaxes[] = {
        "1.3.6.1.4.1.1466.115.121.1.38" /* OID */,
        "1.3.6.1.4.1.1466.115.121.1.3"  /* attributeTypeDescription */,
-       "1.3.6.1.4.1.1466.115.121.1.16" /* ditContentRuleDescription */,
+       "1.3.6.1.4.1.1466.115.121.1.16" /* dITContentRuleDescription */,
        "1.3.6.1.4.1.1466.115.121.1.54" /* ldapSyntaxDescription */,
        "1.3.6.1.4.1.1466.115.121.1.30" /* matchingRuleDescription */,
        "1.3.6.1.4.1.1466.115.121.1.31" /* matchingRuleUseDescription */,

diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index a703f1cb11ac22ae77993d413c8e62283e312882..1d202d98a026efec25a2694d43e66b3ab7ed0de7 100644 (file)
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -367,7 +367,7 @@ static struct slap_schema_oc_map {
        { "subschema", "( 2.5.20.1 NAME 'subschema' "
                "DESC 'RFC2252: controlling subschema (sub)entry' "
                "AUXILIARY "
-               "MAY ( dITStructureRules $ nameForms $ ditContentRules $ "
+               "MAY ( dITStructureRules $ nameForms $ dITContentRules $ "
                        "objectClasses $ attributeTypes $ matchingRules $ "
                        "matchingRuleUse ) )",
                subentryObjectClass, SLAP_OC_OPERATIONAL,
@@ -744,7 +744,7 @@ static struct slap_schema_ad_map {
                offsetof(struct slap_internal_schema, si_ad_subtreeSpecification) },
 
        /* subschema subentry attributes */
-       { "ditStructureRules", "( 2.5.21.1 NAME 'dITStructureRules' "
+       { "dITStructureRules", "( 2.5.21.1 NAME 'dITStructureRules' "
                        "DESC 'RFC2252: DIT structure rules' "
                        "EQUALITY integerFirstComponentMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.17 "
@@ -753,7 +753,7 @@ static struct slap_schema_ad_map {
                NULL, NULL,
                NULL, NULL, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_ditStructureRules) },
-       { "ditContentRules", "( 2.5.21.2 NAME 'dITContentRules' "
+       { "dITContentRules", "( 2.5.21.2 NAME 'dITContentRules' "
                        "DESC 'RFC2252: DIT content rules' "
                        "EQUALITY objectIdentifierFirstComponentMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.16 USAGE directoryOperation )",