ObjectClass *oc = oc_bvfind( value );
ObjectClass *asserted = oc_bvfind( a );
+#if 1
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
+ "> objectClassMatch(%s, %s)\n",
+ value->bv_val, a->bv_val ));
+#else
+ Debug( LDAP_DEBUG_TRACE, "> objectClassMatch(%s,%s)\n",
+ value->bv_val, a->bv_val, 0 );
+#endif
+#endif
+
if( asserted == NULL ) {
if( OID_LEADCHAR( *a->bv_val ) ) {
/* OID form, return FALSE */
*matchp = !is_object_subclass( asserted, oc );
}
-#if 0
+#if 1
#ifdef NEW_LOGGING
LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
- "objectClassMatch(%s, %s) = %d\n",
+ "< objectClassMatch(%s, %s) = %d\n",
value->bv_val, a->bv_val, *matchp ));
#else
- Debug( LDAP_DEBUG_TRACE, "objectClassMatch(%s,%s) = %d\n",
+ Debug( LDAP_DEBUG_TRACE, "< objectClassMatch(%s,%s) = %d\n",
value->bv_val, a->bv_val, *matchp );
#endif
#endif
return LDAP_SUCCESS;
}
+#if 1
+#define structuralObjectClassMatch objectClassMatch
+#else
static int
structuralObjectClassMatch(
int *matchp,
ObjectClass *oc = oc_bvfind( value );
ObjectClass *asserted = oc_bvfind( a );
+#if 1
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
+ "> structuralObjectClassMatch(%s, %s)\n",
+ value->bv_val, a->bv_val ));
+#else
+ Debug( LDAP_DEBUG_TRACE, "> structuralObjectClassMatch(%s,%s)\n",
+ value->bv_val, a->bv_val, 0 );
+#endif
+#endif
+
if( asserted == NULL ) {
if( OID_LEADCHAR( *a->bv_val ) ) {
/* OID form, return FALSE */
*matchp = ( asserted != oc );
-#if 0
+#if 1
#ifdef NEW_LOGGING
LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
- "structuralObjectClassMatch( %s, %s ) = %d\n",
+ "< structuralObjectClassMatch( %s, %s ) = %d\n",
value->bv_val, a->bv_val, *matchp ));
#else
- Debug( LDAP_DEBUG_TRACE, "structuralObjectClassMatch(%s,%s) = %d\n",
+ Debug( LDAP_DEBUG_TRACE, "< structuralObjectClassMatch(%s,%s) = %d\n",
value->bv_val, a->bv_val, *matchp );
#endif
#endif
return LDAP_SUCCESS;
}
+#endif
static ObjectClassSchemaCheckFN rootDseObjectClass;
static ObjectClassSchemaCheckFN aliasObjectClass;
{ "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' "
"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' "
"DESC 'RFC2256: object classes of the entity' "
"EQUALITY objectIdentifierMatch "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )",
- NULL, 0,
- objectClassMatch, NULL, NULL,
+ NULL, 0, objectClassMatch, NULL, NULL,
offsetof(struct slap_internal_schema, si_ad_objectClass) },
/* user entry operational attributes */
"DESC 'X.500(93): structural object class of entry' "
"EQUALITY objectIdentifierMatch "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 "
- "NO-USER-MODIFICATION SINGLE-VALUE USAGE directoryOperation )",
+ "SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )",
NULL, 0, structuralObjectClassMatch, NULL, NULL,
offsetof(struct slap_internal_schema, si_ad_structuralObjectClass) },
{ "createTimestamp", "( 2.5.18.1 NAME 'createTimestamp' "
{ "subschemaSubentry", "( 2.5.18.10 NAME 'subschemaSubentry' "
"DESC 'RFC2252: name of controlling subschema entry' "
"EQUALITY distinguishedNameMatch "
- "SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 NO-USER-MODIFICATION "
- "SINGLE-VALUE USAGE directoryOperation )",
+ "SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE "
+ "NO-USER-MODIFICATION 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 )",
+ "NO-USER-MODIFICATION USAGE directoryOperation )",
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 "
offsetof(struct slap_internal_schema, si_ad_namingContexts) },
{ "supportedControl", "( 1.3.6.1.4.1.1466.101.120.13 "
"NAME 'supportedControl' "
- "DESC 'RFC2252: supported controls' "
- "SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 USAGE dSAOperation )",
+ "DESC 'RFC2252: supported controls' "
+ "SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 USAGE dSAOperation )",
rootDseAttribute, 0, NULL, NULL, NULL,
offsetof(struct slap_internal_schema, si_ad_supportedControl) },
{ "supportedExtension", "( 1.3.6.1.4.1.1466.101.120.7 "
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.12",
offsetof(struct slap_internal_schema, si_syn_distinguishedName) },
{ "1.3.6.1.4.1.1466.115.121.1.27",
slap_schema_load( void )
{
int i;
+
+ for( i=0; syn_map[i].sssm_name; i++ ) {
+ Syntax ** synp = (Syntax **)
+ &(((char *) &slap_schema)[syn_map[i].sssm_offset]);
+
+ assert( *synp == NULL );
+
+ *synp = syn_find( syn_map[i].sssm_name );
+
+ if( *synp == NULL ) {
+ fprintf( stderr, "slap_schema_check: "
+ "No syntax \"%s\" defined in schema\n",
+ syn_map[i].sssm_name );
+ return LDAP_INVALID_SYNTAX;
+ }
+ }
+
+ for( i=0; mr_map[i].ssmm_name; i++ ) {
+ MatchingRule ** mrp = (MatchingRule **)
+ &(((char *) &slap_schema)[mr_map[i].ssmm_offset]);
+
+ assert( *mrp == NULL );
+
+ *mrp = mr_find( mr_map[i].ssmm_name );
+
+ if( *mrp == NULL ) {
+ fprintf( stderr, "slap_schema_check: "
+ "No matching rule \"%s\" defined in schema\n",
+ mr_map[i].ssmm_name );
+ return LDAP_INAPPROPRIATE_MATCHING;
+ }
+ }
+
for( i=0; ad_map[i].ssam_name; i++ ) {
- if( ad_map[i].ssam_defn != NULL ) {
+ assert( ad_map[i].ssam_defn != NULL );
+ {
LDAPAttributeType *at;
int code;
const char *err;
}
ldap_memfree( at );
}
+ {
+ int rc;
+ const char *text;
+
+ AttributeDescription ** adp = (AttributeDescription **)
+ &(((char *) &slap_schema)[ad_map[i].ssam_offset]);
+
+ assert( *adp == NULL );
+
+ 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",
+ ad_map[i].ssam_name );
+ return rc;
+ }
+
+ if( ad_map[i].ssam_check ) {
+ /* install check routine */
+ (*adp)->ad_type->sat_check = ad_map[i].ssam_check;
+ }
+ /* install flags */
+ (*adp)->ad_type->sat_flags |= ad_map[i].ssam_flags;
+
+ if( ad_map[i].ssam_match ) {
+ /* install custom matching routine */
+ (*adp)->ad_type->sat_equality->smr_match = ad_map[i].ssam_match;
+ }
+ }
}
for( i=0; oc_map[i].ssom_name; i++ ) {
- if( oc_map[i].ssom_defn != NULL ) {
+ assert( oc_map[i].ssom_defn != NULL );
+ {
LDAPObjectClass *oc;
int code;
const char *err;
ldap_memfree(oc);
}
+ {
+ ObjectClass ** ocp = (ObjectClass **)
+ &(((char *) &slap_schema)[oc_map[i].ssom_offset]);
+
+ assert( *ocp == NULL );
+
+ *ocp = oc_find( oc_map[i].ssom_name );
+ if( *ocp == NULL ) {
+ fprintf( stderr, "slap_schema_check: "
+ "No objectClass \"%s\" defined in schema\n",
+ oc_map[i].ssom_name );
+ return LDAP_OBJECT_CLASS_VIOLATION;
+ }
+
+ if( oc_map[i].ssom_check ) {
+ /* install check routine */
+ (*ocp)->soc_check = oc_map[i].ssom_check;
+ }
+ /* install flags */
+ (*ocp)->soc_flags |= oc_map[i].ssom_flags;
+ }
}
+ slap_at_undefined.sat_syntax = slap_schema.si_syn_distinguishedName;
+ slap_schema.si_at_undefined = &slap_at_undefined;
+
return LDAP_SUCCESS;
}
int
slap_schema_check( void )
{
- int i;
/* we should only be called once after schema_init() was called */
assert( schema_init_done == 1 );
- for( i=0; syn_map[i].sssm_name; i++ ) {
- Syntax ** synp = (Syntax **)
- &(((char *) &slap_schema)[syn_map[i].sssm_offset]);
-
- assert( *synp == NULL );
-
- *synp = syn_find( syn_map[i].sssm_name );
-
- if( *synp == NULL ) {
- fprintf( stderr, "slap_schema_check: "
- "No syntax \"%s\" defined in schema\n",
- syn_map[i].sssm_name );
- return LDAP_INVALID_SYNTAX;
- }
- }
-
- for( i=0; mr_map[i].ssmm_name; i++ ) {
- MatchingRule ** mrp = (MatchingRule **)
- &(((char *) &slap_schema)[mr_map[i].ssmm_offset]);
-
- assert( *mrp == NULL );
-
- *mrp = mr_find( mr_map[i].ssmm_name );
-
- if( *mrp == NULL ) {
- fprintf( stderr, "slap_schema_check: "
- "No matching rule \"%s\" defined in schema\n",
- mr_map[i].ssmm_name );
- return LDAP_INAPPROPRIATE_MATCHING;
- }
- }
-
- slap_at_undefined.sat_syntax = syn_find( SLAPD_OCTETSTRING_SYNTAX );
- if( slap_at_undefined.sat_syntax == NULL ) {
- fprintf( stderr, "slap_schema_check: "
- "No octetString syntax \"" SLAPD_OCTETSTRING_SYNTAX "\"\n" );
- return LDAP_INVALID_SYNTAX;
- }
- slap_schema.si_at_undefined = &slap_at_undefined;
-
- for( i=0; ad_map[i].ssam_name; i++ ) {
- int rc;
- const char *text;
-
- AttributeDescription ** adp = (AttributeDescription **)
- &(((char *) &slap_schema)[ad_map[i].ssam_offset]);
-
- assert( *adp == NULL );
-
- 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",
- ad_map[i].ssam_name );
- return rc;
- }
-
- if( ad_map[i].ssam_check ) {
- /* install check routine */
- (*adp)->ad_type->sat_check = ad_map[i].ssam_check;
- }
- /* install flags */
- (*adp)->ad_type->sat_flags |= ad_map[i].ssam_flags;
-
- if( ad_map[i].ssam_match ) {
- /* install custom matching routine */
- (*adp)->ad_type->sat_equality->smr_match = ad_map[i].ssam_match;
- }
- }
-
- for( i=0; oc_map[i].ssom_name; i++ ) {
- ObjectClass ** ocp = (ObjectClass **)
- &(((char *) &slap_schema)[oc_map[i].ssom_offset]);
-
- assert( *ocp == NULL );
-
- *ocp = oc_find( oc_map[i].ssom_name );
- if( *ocp == NULL ) {
- fprintf( stderr, "slap_schema_check: "
- "No objectClass \"%s\" defined in schema\n",
- oc_map[i].ssom_name );
- return LDAP_OBJECT_CLASS_VIOLATION;
- }
-
- if( oc_map[i].ssom_check ) {
- /* install check routine */
- (*ocp)->soc_check = oc_map[i].ssom_check;
- }
- /* install flags */
- (*ocp)->soc_flags |= oc_map[i].ssom_flags;
- }
-
++schema_init_done;
return LDAP_SUCCESS;
}