From 78af5454d283a2e578242cfce3972cb9df5193f9 Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Sat, 2 Dec 2006 10:30:29 +0000 Subject: [PATCH] use case consistent with RFCs (ITS#4764) --- servers/slapd/schema_init.c | 4 ++-- servers/slapd/schema_prep.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c index 9916253657..69c93f270d 100644 --- a/servers/slapd/schema_init.c +++ b/servers/slapd/schema_init.c @@ -4165,13 +4165,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 568f9980c7..7c6b0defa3 100644 --- a/servers/slapd/schema_prep.c +++ b/servers/slapd/schema_prep.c @@ -363,7 +363,7 @@ static struct slap_schema_oc_map { { "subschema", "( 2.5.20.1 NAME 'subschema' " "DESC 'RFC4512: controlling subschema (sub)entry' " "AUXILIARY " - "MAY ( dITStructureRules $ nameForms $ ditContentRules $ " + "MAY ( dITStructureRules $ nameForms $ dITContentRules $ " "objectClasses $ attributeTypes $ matchingRules $ " "matchingRuleUse ) )", subentryObjectClass, SLAP_OC_OPERATIONAL, @@ -742,7 +742,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 'RFC4512: DIT structure rules' " "EQUALITY integerFirstComponentMatch " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.17 " @@ -751,7 +751,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 'RFC4512: DIT content rules' " "EQUALITY objectIdentifierFirstComponentMatch " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.16 USAGE directoryOperation )",