X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fschema_prep.c;h=9ae8843b22799144f376a09e933a6d597ad88b09;hb=78066c08c0650e5b1e7e205946d409e3dd10e73b;hp=086b1a225038431e50bd25e657c05747b7596de1;hpb=89b09b020da74a14f47f456510db9253a8a40b87;p=openldap

diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index 086b1a2250..9ae8843b22 100644
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -15,25 +15,111 @@
 
 #include "slap.h"
 #include "ldap_pvt.h"
+#include "ldap_pvt_uc.h"
 
 int schema_init_done = 0;
 
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
 struct slap_internal_schema slap_schema;
 
+#define objectClassIndexer NULL
+#define objectClassFilter NULL
+
 static int
 objectClassMatch(
-	int *match,
-	unsigned use,
+	int *matchp,
+	slap_mask_t flags,
 	Syntax *syntax,
 	MatchingRule *mr,
 	struct berval *value,
 	void *assertedValue )
 {
+	struct berval *a = (struct berval *) assertedValue;
 	ObjectClass *oc = oc_find( value->bv_val );
-	ObjectClass *asserted = oc_find( ((struct berval *) assertedValue)->bv_val );
+	ObjectClass *asserted = oc_find( a->bv_val );
+
+	if( asserted == NULL ) {
+		if( OID_LEADCHAR( *a->bv_val ) ) {
+			/* OID form, return FALSE */
+			*matchp = 1;
+			return LDAP_SUCCESS;
+		}
+
+		/* desc form, return undefined */
+		return SLAPD_COMPARE_UNDEFINED;
+	}
+
+	if ( oc == NULL ) {
+		/* unrecognized stored value */
+		return SLAPD_COMPARE_UNDEFINED;
+	}
+
+	if( flags & SLAP_MR_MODIFY_MATCHING ) {
+		*matchp = ( asserted != oc );
+	} else {
+		*matchp = !is_object_subclass( asserted, oc );
+	}
+
+#if 0
+#ifdef NEW_LOGGING
+	LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
+		   "objectClassMatch(%s, %s) = %d\n",
+		   value->bv_val, a->bv_val, *matchp ));
+#else
+	Debug( LDAP_DEBUG_TRACE, "objectClassMatch(%s,%s) = %d\n",
+		value->bv_val, a->bv_val, *matchp );
+#endif
+
+#endif
+
+	return LDAP_SUCCESS;
+}
+
+#define structuralObjectClassIndexer NULL
+#define structuralObjectClassFilter NULL
+
+static int
+structuralObjectClassMatch(
+	int *matchp,
+	slap_mask_t flags,
+	Syntax *syntax,
+	MatchingRule *mr,
+	struct berval *value,
+	void *assertedValue )
+{
+	struct berval *a = (struct berval *) assertedValue;
+	ObjectClass *oc = oc_find( value->bv_val );
+	ObjectClass *asserted = oc_find( a->bv_val );
+
+	if( asserted == NULL ) {
+		if( OID_LEADCHAR( *a->bv_val ) ) {
+			/* OID form, return FALSE */
+			*matchp = 1;
+			return LDAP_SUCCESS;
+		}
+
+		/* desc form, return undefined */
+		return SLAPD_COMPARE_UNDEFINED;
+	}
+
+	if ( oc == NULL ) {
+		/* unrecognized stored value */
+		return SLAPD_COMPARE_UNDEFINED;
+	}
+
+	*matchp = ( asserted != oc );
+
+#if 0
+#ifdef NEW_LOGGING
+	LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
+		   "structuralObjectClassMatch( %s, %s ) = %d\n",
+		   value->bv_val, a->bv_val, *matchp ));
+#else
+	Debug( LDAP_DEBUG_TRACE, "structuralObjectClassMatch(%s,%s) = %d\n",
+		value->bv_val, a->bv_val, *matchp );
+#endif
+
+#endif
 
-	*match = ( oc == NULL || oc != asserted );
 	return LDAP_SUCCESS;
 }
 
@@ -41,88 +127,138 @@ struct slap_schema_oc_map {
 	char *ssom_name;
 	size_t ssom_offset;
 } oc_map[] = {
+	{ "top", offsetof(struct slap_internal_schema, si_oc_top) },
+	{ "extensibleObject", offsetof(struct slap_internal_schema, si_oc_extensibleObject) },
 	{ "alias", offsetof(struct slap_internal_schema, si_oc_alias) },
 	{ "referral", offsetof(struct slap_internal_schema, si_oc_referral) },
+	{ "LDAProotDSE", offsetof(struct slap_internal_schema, si_oc_rootdse) },
+	{ "LDAPsubentry", offsetof(struct slap_internal_schema, si_oc_subentry) },
+	{ "subschema", offsetof(struct slap_internal_schema, si_oc_subschema) },
 	{ NULL, 0 }
 };
 
 struct slap_schema_ad_map {
 	char *ssam_name;
 	slap_mr_match_func *ssam_match;
+	slap_mr_indexer_func *ssam_indexer;
+	slap_mr_filter_func *ssam_filter;
 	size_t ssam_offset;
 } ad_map[] = {
-	{ "objectClass", objectClassMatch,
+	{ "objectClass",
+		objectClassMatch, objectClassIndexer, objectClassFilter,
 		offsetof(struct slap_internal_schema, si_ad_objectClass) },
+	{ "structuralObjectClass",
+		structuralObjectClassMatch,
+		structuralObjectClassIndexer, structuralObjectClassFilter,
+		offsetof(struct slap_internal_schema, si_ad_structuralObjectClass) },
 
-	{ "creatorsName", NULL,
+	/* user entry operational attributes */
+	{ "creatorsName", NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_creatorsName) },
-	{ "createTimestamp", NULL,
+	{ "createTimestamp", NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_createTimestamp) },
-	{ "modifiersName", NULL,
+	{ "modifiersName", NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_modifiersName) },
-	{ "modifyTimestamp", NULL,
+	{ "modifyTimestamp", NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_modifyTimestamp) },
-
-	{ "subschemaSubentry", NULL,
+	{ "subschemaSubentry", NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_subschemaSubentry) },
 
-	{ "namingContexts", NULL,
+	/* root DSE attributes */
+	{ "namingContexts", NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_namingContexts) },
-	{ "supportedControl", NULL,
+	{ "supportedControl", NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_supportedControl) },
-	{ "supportedExtension", NULL,
+	{ "supportedExtension", NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_supportedExtension) },
-	{ "supportedLDAPVersion", NULL,
+	{ "supportedLDAPVersion", NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_supportedLDAPVersion) },
-#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
-	{ "supportedACIMechanisms", NULL,
-		offsetof(struct slap_internal_schema, si_ad_supportedACIMechanisms) },
-
-#endif
-	{ "supportedSASLMechanisms", NULL,
+	{ "supportedSASLMechanisms", NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_supportedSASLMechanisms) },
+	{ "supportedFeatures", NULL, NULL, NULL,
+		offsetof(struct slap_internal_schema, si_ad_supportedFeatures) },
 
-	{ "attributeTypes", NULL,
+	/* subschema subentry attributes */
+	{ "attributeTypes", NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_attributeTypes) },
-	{ "ldapSyntaxes", NULL,
+	{ "ldapSyntaxes", NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_ldapSyntaxes) },
-	{ "matchingRules", NULL,
+	{ "matchingRules", NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_matchingRules) },
-	{ "objectClasses", NULL,
+	{ "objectClasses", NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_objectClasses) },
 
-	{ "ref", NULL,
+	/* knowledge information */
+	{ "aliasedObjectName", NULL, NULL, NULL,
+		offsetof(struct slap_internal_schema, si_ad_aliasedObjectName) },
+	{ "ref", NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_ref) },
 
-	{ "entry", NULL,
+	/* access control internals */
+	{ "entry", NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_entry) },
-	{ "children", NULL,
+	{ "children", NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_children) },
+#ifdef SLAPD_ACI_ENABLED
+	{ "OpenLDAPaci", NULL, NULL, NULL,
+		offsetof(struct slap_internal_schema, si_ad_aci) },
+#endif
 
-	{ "userPassword", NULL,
+	{ "userPassword", NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_userPassword) },
-	{ "authPassword", NULL,
+	{ "authPassword", NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_authPassword) },
 #ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
-	{ "krbName", NULL,
+	{ "krbName", NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_krbName) },
 #endif
 
-	{ NULL, NULL, 0 }
+	{ NULL, NULL, NULL, NULL, 0 }
 };
 
-#endif
+static AttributeType slap_at_undefined = {
+	{ "1.1.1", NULL, NULL, 1, NULL,
+		NULL, NULL, NULL, NULL,
+		0, 0, 0, 1, 3 }, /* LDAPAttributeType */
+	{ sizeof( "UNDEFINED" ) - 1, "UNDEFINED" }, /* cname */
+	NULL, /* sup */
+	NULL, /* subtypes */
+	NULL, NULL, NULL, NULL,	/* matching rules */
+	NULL, /* syntax (this may need to be defined) */
+	NULL, /* attribute description */
+	NULL  /* next */
+	/* mutex (don't know how to initialize it :) */
+};
+
+struct slap_schema_mr_map {
+	char *ssmm_name;
+	size_t ssmm_offset;
+} mr_map[] = {
+	{ "distinguishedNameMatch",
+		offsetof(struct slap_internal_schema, si_mr_distinguishedNameMatch) },
+	{ "integerMatch",
+		offsetof(struct slap_internal_schema, si_mr_integerMatch) },
+	{ NULL, 0 }
+};
+
+struct slap_schema_syn_map {
+	char *sssm_name;
+	size_t sssm_offset;
+} syn_map[] = {
+	{ "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) },
+	{ NULL, 0 }
+};
 
 int
 schema_prep( void )
 {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
 	int i;
-#endif
 	/* we should only be called once after schema_init() was called */
 	assert( schema_init_done == 1 );
 
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
 	for( i=0; oc_map[i].ssom_name; i++ ) {
 		ObjectClass ** ocp = (ObjectClass **)
 			&(((char *) &slap_schema)[oc_map[i].ssom_offset]);
@@ -160,7 +296,42 @@ schema_prep( void )
 			(*adp)->ad_type->sat_equality->smr_match = ad_map[i].ssam_match;
 		}
 	}
-#endif
+
+	slap_at_undefined.sat_syntax = syn_find( SLAPD_OCTETSTRING_SYNTAX );
+	if( slap_at_undefined.sat_syntax == NULL ) {
+		fprintf( stderr,
+			"No octetString syntax \"" SLAPD_OCTETSTRING_SYNTAX "\"\n" );
+		return LDAP_INVALID_SYNTAX;
+	}
+	slap_schema.si_at_undefined = &slap_at_undefined;
+
+	for( i=0; mr_map[i].ssmm_name; i++ ) {
+		MatchingRule ** mrp = (MatchingRule **)
+			&(((char *) &slap_schema)[mr_map[i].ssmm_offset]);
+
+		*mrp = mr_find( mr_map[i].ssmm_name );
+
+		if( *mrp == NULL ) {
+			fprintf( stderr,
+				"No matching rule \"%s\" defined in schema\n",
+				mr_map[i].ssmm_name );
+			return LDAP_INAPPROPRIATE_MATCHING;
+		}
+	}
+
+	for( i=0; syn_map[i].sssm_name; i++ ) {
+		Syntax ** synp = (Syntax **)
+			&(((char *) &slap_schema)[syn_map[i].sssm_offset]);
+
+		*synp = syn_find( syn_map[i].sssm_name );
+
+		if( *synp == NULL ) {
+			fprintf( stderr,
+				"No syntax \"%s\" defined in schema\n",
+				syn_map[i].sssm_name );
+			return LDAP_INVALID_SYNTAX;
+		}
+	}
 
 	++schema_init_done;
 	return LDAP_SUCCESS;