X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fschema_prep.c;h=7c145bf148ab728f7c46855cba01436d9a9969d4;hb=ca9bb44089145bdb7435135714590d48f4a6eabd;hp=8da0c25153a541277306a2a63150114c85a1f0ce;hpb=923d033c99342120e0736d07e27137a82af74c79;p=openldap diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c index 8da0c25153..7c145bf148 100644 --- a/servers/slapd/schema_prep.c +++ b/servers/slapd/schema_prep.c @@ -1,7 +1,7 @@ /* schema_init.c - init builtin schema */ /* $OpenLDAP$ */ /* - * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ @@ -28,14 +28,15 @@ static int objectClassNormalize( struct slap_syntax *syntax, /* NULL if in is asserted value */ struct slap_matching_rule *mr, struct berval * in, - struct berval * out ) + struct berval * out, + void *ctx ) { ObjectClass *oc = oc_bvfind( in ); if( oc != NULL ) { - ber_dupbv( out, &oc->soc_cname ); + ber_dupbv_x( out, &oc->soc_cname, ctx ); } else { - ber_dupbv( out, in ); + ber_dupbv_x( out, in, ctx ); } #if OCDEBUG @@ -90,7 +91,8 @@ objectSubClassMatch( return SLAPD_COMPARE_UNDEFINED; } - if( SLAP_IS_MR_VALUE_SYNTAX_MATCH( flags ) ) { + if( SLAP_MR_IS_VALUE_OF_ATTRIBUTE_SYNTAX( flags ) ) + { *matchp = ( asserted != oc ); } else { *matchp = !is_object_subclass( asserted, oc ); @@ -117,7 +119,8 @@ static int objectSubClassIndexer( struct slap_matching_rule *mr, struct berval *prefix, BerVarray values, - BerVarray *keysp ) + BerVarray *keysp, + void *ctx ) { int rc, noc, i; BerVarray ocvalues; @@ -127,7 +130,7 @@ static int objectSubClassIndexer( } /* over allocate */ - ocvalues = ch_malloc( sizeof( struct berval ) * (noc+16) ); + ocvalues = sl_malloc( sizeof( struct berval ) * (noc+16), ctx ); /* copy listed values (and termination) */ for( i=0; isoc_sups == NULL ) continue; for( j=0; oc->soc_sups[j] != NULL; j++ ) { @@ -174,15 +180,15 @@ static int objectSubClassIndexer( k, ocvalues[k].bv_val, sup->soc_cname.bv_val ); #endif #endif - if( ber_bvcmp( &ocvalues[k], &sup->soc_cname ) == 0 ) { + if( bvmatch( &ocvalues[k], &sup->soc_cname ) ) { found++; break; } } if( !found ) { - ocvalues = ch_realloc( ocvalues, - sizeof( struct berval ) * (noc+2) ); + ocvalues = sl_realloc( ocvalues, + sizeof( struct berval ) * (noc+2), ctx ); assert( k == noc ); @@ -222,9 +228,9 @@ static int objectSubClassIndexer( #endif rc = octetStringIndexer( use, mask, syntax, mr, - prefix, ocvalues, keysp ); + prefix, ocvalues, keysp, ctx ); - ch_free( ocvalues ); + sl_free( ocvalues, ctx ); return rc; } @@ -236,7 +242,8 @@ static int objectSubClassFilter( MatchingRule *mr, struct berval *prefix, void * assertedValue, - BerVarray *keysp ) + BerVarray *keysp, + void *ctx ) { #if OCDEBUG struct berval *bv = (struct berval *) assertedValue; @@ -255,7 +262,7 @@ static int objectSubClassFilter( #endif return octetStringFilter( use, flags, syntax, mr, - prefix, assertedValue, keysp ); + prefix, assertedValue, keysp, ctx ); } static ObjectClassSchemaCheckFN rootDseObjectClass; @@ -298,7 +305,7 @@ static struct slap_schema_oc_map { "SUP top STRUCTURAL MAY cn )", rootDseObjectClass, SLAP_OC_OPERATIONAL, offsetof(struct slap_internal_schema, si_oc_rootdse) }, - { "subentry", "( 2.5.20.0 NAME 'subentry' " + { "subentry", "( 2.5.17.0 NAME 'subentry' " "SUP top STRUCTURAL " "MUST ( cn $ subtreeSpecification ) )", subentryObjectClass, SLAP_OC_SUBENTRY|SLAP_OC_OPERATIONAL, @@ -311,13 +318,8 @@ static struct slap_schema_oc_map { "matchingRuleUse ) )", subentryObjectClass, SLAP_OC_OPERATIONAL, 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, SLAP_OC_OPERATIONAL, - offsetof(struct slap_internal_schema, si_oc_monitor) }, - { "collectiveAttributeSubentry", "( 2.5.20.2 " +#ifdef LDAP_DEVEL + { "collectiveAttributeSubentry", "( 2.5.17.2 " "NAME 'collectiveAttributeSubentry' " "AUXILIARY )", subentryObjectClass, @@ -329,6 +331,7 @@ static struct slap_schema_oc_map { "SUP top AUXILIARY )", dynamicObjectClass, SLAP_OC_DYNAMICOBJECT, offsetof(struct slap_internal_schema, si_oc_dynamicObject) }, +#endif { NULL, NULL, NULL, 0, 0 } }; @@ -420,6 +423,7 @@ static struct slap_schema_ad_map { NULL, 0, NULL, NULL, NULL, NULL, NULL, offsetof(struct slap_internal_schema, si_ad_subschemaSubentry) }, +#ifdef LDAP_DEVEL { "collectiveAttributeSubentries", "( 2.5.18.12 " "NAME 'collectiveAttributeSubentries' " "EQUALITY distinguishedNameMatch " @@ -435,9 +439,10 @@ static struct slap_schema_ad_map { NULL, SLAP_AT_HIDE, NULL, NULL, NULL, NULL, NULL, offsetof(struct slap_internal_schema, si_ad_collectiveExclusions) }, +#endif { "entryUUID", "( 1.3.6.1.4.1.4203.666.1.6 NAME 'entryUUID' " - "DESC 'LCUP/LDUP: universally unique identifier' " + "DESC 'LCUP/LDUP: UUID of the entry' " "EQUALITY octetStringMatch " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{64} " "SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )", @@ -445,13 +450,44 @@ static struct slap_schema_ad_map { NULL, NULL, NULL, NULL, NULL, offsetof(struct slap_internal_schema, si_ad_entryUUID) }, { "entryCSN", "( 1.3.6.1.4.1.4203.666.1.7 NAME 'entryCSN' " - "DESC 'LCUP/LDUP: change sequence number' " + "DESC 'LCUP/LDUP: change sequence number of the entry content' " "EQUALITY octetStringMatch " + "ORDERING octetStringOrderingMatch " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{64} " "SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )", NULL, SLAP_AT_HIDE, NULL, NULL, NULL, NULL, NULL, offsetof(struct slap_internal_schema, si_ad_entryCSN) }, + { "namingCSN", "( 1.3.6.1.4.1.4203.666.1.13 NAME 'namingCSN' " + "DESC 'LCUP/LDUP: change sequence number of the entry naming (RDN)' " + "EQUALITY octetStringMatch " + "ORDERING octetStringOrderingMatch " + "SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{64} " + "SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )", + NULL, SLAP_AT_HIDE, + NULL, NULL, NULL, NULL, NULL, + offsetof(struct slap_internal_schema, si_ad_namingCSN) }, + + { "superiorUUID", "( 1.3.6.1.4.1.4203.666.1.11 NAME 'superiorUUID' " + "DESC 'LCUP/LDUP: UUID of the superior entry' " + "EQUALITY octetStringMatch " + "SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{64} " + "SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )", + NULL, SLAP_AT_HIDE, + NULL, NULL, NULL, NULL, NULL, + offsetof(struct slap_internal_schema, si_ad_superiorUUID) }, + +#ifdef LDAP_CACHING + /* LDAP cache specific operational attribute */ + { "queryid", "( 1.3.6.1.4.1.4203.666.1.12 NAME 'queryid' " + "DESC 'list of queries the entry belongs to' " + "EQUALITY octetStringMatch " + "SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{64} " + "NO-USER-MODIFICATION USAGE directoryOperation )", + NULL, 0, /* SLAP_AT_HIDE or SLAP_AT_NONE ? */ + NULL, NULL, NULL, NULL, NULL, + offsetof(struct slap_internal_schema, si_ad_queryid) }, +#endif /* LDAP_CACHING */ /* root DSE attributes */ { "altServer", "( 1.3.6.1.4.1.1466.101.120.6 NAME 'altServer' " @@ -507,8 +543,7 @@ static struct slap_schema_ad_map { { "monitorContext", "( 1.3.6.1.4.1.4203.666.1.10 " "NAME 'monitorContext' " "DESC 'monitor context' " - "EQUALITY objectIdentifierMatch " - "SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 " + "SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 " "SINGLE-VALUE NO-USER-MODIFICATION " "USAGE dSAOperation )", rootDseAttribute, SLAP_AT_HIDE, @@ -516,7 +551,7 @@ static struct slap_schema_ad_map { offsetof(struct slap_internal_schema, si_ad_monitorContext) }, { "vendorName", "( 1.3.6.1.1.4 NAME 'vendorName' " "DESC 'RFC3045: name of implementation vendor' " - "EQUALITY 1.3.6.1.4.1.1466.109.114.1 " + "EQUALITY caseExactMatch " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 " "SINGLE-VALUE NO-USER-MODIFICATION " "USAGE dSAOperation )", @@ -525,7 +560,7 @@ static struct slap_schema_ad_map { offsetof(struct slap_internal_schema, si_ad_vendorName) }, { "vendorVersion", "( 1.3.6.1.1.5 NAME 'vendorVersion' " "DESC 'RFC3045: version of implementation' " - "EQUALITY 1.3.6.1.4.1.1466.109.114.1 " + "EQUALITY caseExactMatch " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 " "SINGLE-VALUE NO-USER-MODIFICATION " "USAGE dSAOperation )", @@ -597,7 +632,7 @@ static struct slap_schema_ad_map { "DESC 'RFC2252: matching rule uses' " "EQUALITY objectIdentifierFirstComponentMatch " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.31 USAGE directoryOperation )", - subentryAttribute, SLAP_AT_HIDE, + subentryAttribute, 0, NULL, NULL, NULL, NULL, NULL, offsetof(struct slap_internal_schema, si_ad_matchingRuleUse) }, @@ -674,6 +709,7 @@ static struct slap_schema_ad_map { offsetof(struct slap_internal_schema, si_ad_aci) }, #endif +#ifdef LDAP_DEVEL { "entryTtl", "( 1.3.6.1.4.1.1466.101.119.3 NAME 'entryTtl' " "DESC 'RFC2589: entry time-to-live' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE " @@ -689,6 +725,7 @@ static struct slap_schema_ad_map { rootDseAttribute, 0, NULL, NULL, NULL, NULL, NULL, offsetof(struct slap_internal_schema, si_ad_dynamicSubtrees) }, +#endif /* userApplication attributes (which system schema depends upon) */ { "distinguishedName", "( 2.5.4.49 NAME 'distinguishedName' " @@ -750,14 +787,13 @@ static struct slap_schema_ad_map { NULL, NULL, NULL, NULL, NULL, offsetof(struct slap_internal_schema, si_ad_krbName) }, #endif - - { NULL, NULL, NULL, 0, NULL, NULL, NULL, 0 } + { NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, 0 } }; static AttributeType slap_at_undefined = { { "1.1.1", NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, - 0, 0, 0, 1, 3 }, /* LDAPAttributeType */ + 0, 0, 0, 1, 3, NULL }, /* LDAPAttributeType */ { sizeof("UNDEFINED")-1, "UNDEFINED" }, /* cname */ NULL, /* sup */ NULL, /* subtypes */ @@ -765,7 +801,7 @@ static AttributeType slap_at_undefined = { NULL, /* syntax (this may need to be defined) */ (AttributeTypeSchemaCheckFN *) 0, /* schema check function */ SLAP_AT_ABSTRACT|SLAP_AT_FINAL, /* mask */ - NULL, /* next */ + { NULL }, /* next */ NULL /* attribute description */ /* mutex (don't know how to initialize it :) */ }; @@ -774,10 +810,18 @@ static struct slap_schema_mr_map { char *ssmm_name; size_t ssmm_offset; } mr_map[] = { + { "caseExactIA5Match", + offsetof(struct slap_internal_schema, si_mr_caseExactIA5Match) }, + { "caseExactMatch", + offsetof(struct slap_internal_schema, si_mr_caseExactMatch) }, + { "caseExactSubstringsMatch", + offsetof(struct slap_internal_schema, si_mr_caseExactSubstringsMatch) }, { "distinguishedNameMatch", offsetof(struct slap_internal_schema, si_mr_distinguishedNameMatch) }, { "integerMatch", offsetof(struct slap_internal_schema, si_mr_integerMatch) }, + { "integerFirstComponentMatch", offsetof(struct slap_internal_schema, + si_mr_integerFirstComponentMatch) }, { NULL, 0 } }; @@ -785,12 +829,14 @@ static struct slap_schema_syn_map { char *sssm_name; size_t sssm_offset; } syn_map[] = { - { "1.3.6.1.4.1.1466.115.121.1.40", - offsetof(struct slap_internal_schema, si_syn_octetString) }, + { "1.3.6.1.4.1.1466.115.121.1.15", + offsetof(struct slap_internal_schema, si_syn_directoryString) }, { "1.3.6.1.4.1.1466.115.121.1.12", offsetof(struct slap_internal_schema, si_syn_distinguishedName) }, { "1.3.6.1.4.1.1466.115.121.1.27", offsetof(struct slap_internal_schema, si_syn_integer) }, + { "1.3.6.1.4.1.1466.115.121.1.40", + offsetof(struct slap_internal_schema, si_syn_octetString) }, { NULL, 0 } }; @@ -808,7 +854,7 @@ slap_schema_load( void ) *synp = syn_find( syn_map[i].sssm_name ); if( *synp == NULL ) { - fprintf( stderr, "slap_schema_check: " + fprintf( stderr, "slap_schema_load: Syntax: " "No syntax \"%s\" defined in schema\n", syn_map[i].sssm_name ); return LDAP_INVALID_SYNTAX; @@ -824,7 +870,7 @@ slap_schema_load( void ) *mrp = mr_find( mr_map[i].ssmm_name ); if( *mrp == NULL ) { - fprintf( stderr, "slap_schema_check: " + fprintf( stderr, "slap_schema_load: MatchingRule: " "No matching rule \"%s\" defined in schema\n", mr_map[i].ssmm_name ); return LDAP_INAPPROPRIATE_MATCHING; @@ -842,22 +888,22 @@ slap_schema_load( void ) &code, &err, LDAP_SCHEMA_ALLOW_ALL ); if ( !at ) { fprintf( stderr, - "slap_schema_load: %s: %s before %s\n", + "slap_schema_load: AttributeType \"%s\": %s before %s\n", ad_map[i].ssam_name, ldap_scherr2str(code), err ); return code; } if ( at->at_oid == NULL ) { fprintf( stderr, "slap_schema_load: " - "attributeType \"%s\" has no OID\n", + "AttributeType \"%s\": no OID\n", ad_map[i].ssam_name ); return LDAP_OTHER; } code = at_add( at, &err ); if ( code ) { - fprintf( stderr, "slap_schema_load: " - "%s: %s: \"%s\"\n", + fprintf( stderr, "slap_schema_load: AttributeType " + "\"%s\": %s: \"%s\"\n", ad_map[i].ssam_name, scherr2str(code), err ); return code; } @@ -874,8 +920,8 @@ slap_schema_load( void ) rc = slap_str2ad( ad_map[i].ssam_name, adp, &text ); if( rc != LDAP_SUCCESS ) { - fprintf( stderr, "slap_schema_check: " - "No attribute \"%s\" defined in schema\n", + fprintf( stderr, "slap_schema_load: AttributeType \"%s\": " + "not defined in schema\n", ad_map[i].ssam_name ); return rc; } @@ -927,23 +973,23 @@ slap_schema_load( void ) oc = ldap_str2objectclass( oc_map[i].ssom_defn, &code, &err, LDAP_SCHEMA_ALLOW_ALL ); if ( !oc ) { - fprintf( stderr, "slap_schema_load: " - "%s: %s before %s\n", + fprintf( stderr, "slap_schema_load: ObjectClass " + "\"%s\": %s before %s\n", oc_map[i].ssom_name, ldap_scherr2str(code), err ); return code; } if ( oc->oc_oid == NULL ) { - fprintf( stderr, "slap_schema_load: " - "%s: objectclass has no OID\n", + fprintf( stderr, "slap_schema_load: ObjectClass " + "\"%s\": no OID\n", oc_map[i].ssom_name ); return LDAP_OTHER; } code = oc_add(oc,0,&err); if ( code ) { - fprintf( stderr, "slap_schema_load: " - "%s: %s: \"%s\"\n", + fprintf( stderr, "slap_schema_load: ObjectClass " + "\"%s\": %s: \"%s\"\n", oc_map[i].ssom_name, scherr2str(code), err); return code; } @@ -958,8 +1004,8 @@ slap_schema_load( void ) *ocp = oc_find( oc_map[i].ssom_name ); if( *ocp == NULL ) { - fprintf( stderr, "slap_schema_check: " - "No objectClass \"%s\" defined in schema\n", + fprintf( stderr, "slap_schema_load: " + "ObjectClass \"%s\": not defined in schema\n", oc_map[i].ssom_name ); return LDAP_OBJECT_CLASS_VIOLATION; } @@ -985,6 +1031,13 @@ slap_schema_check( void ) /* we should only be called once after schema_init() was called */ assert( schema_init_done == 1 ); + /* + * cycle thru attributeTypes to build matchingRuleUse + */ + if ( matching_rule_use_init() ) { + return LDAP_OTHER; + } + ++schema_init_done; return LDAP_SUCCESS; }