mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

use case consistent with RFCs (ITS#4764)

Browse Source
This commit is contained in:
Pierangelo Masarati 2006-12-02 10:30:29 +00:00
parent 2e4ab03f1f
commit 78af5454d2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
servers/slapd/schema_init.c
View File

@ -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 */,

6
servers/slapd/schema_prep.c
View File

@ -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 )",