Fixup bdb_entry_release now that entry_decode uses two memory blocks

[openldap] / servers / slapd / schema_prep.c

diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index 12b0af963ffa0d6f049d0d637cd4b646b2df2044..e34914c15b371e6d043798006b6747b1420aacaf 100644 (file)
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -15,7 +15,7 @@
 
 #include "slap.h"
 #include "ldap_pvt.h"
-#include "../libraries/liblunicode/ucdata.h"
+#include "ldap_pvt_uc.h"
 
 int schema_init_done = 0;
 
@@ -53,15 +53,22 @@ objectClassMatch(
                return SLAPD_COMPARE_UNDEFINED;
        }
 
-       if( flags & SLAP_MR_MODIFY_MATCHING ) {
+       if( SLAP_IS_MR_VALUE_SYNTAX_MATCH( flags ) ) {
                *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;
@@ -102,8 +109,15 @@ structuralObjectClassMatch(
        *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
 
        return LDAP_SUCCESS;
@@ -161,6 +175,8 @@ struct slap_schema_ad_map {
                offsetof(struct slap_internal_schema, si_ad_supportedLDAPVersion) },
        { "supportedSASLMechanisms", NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_supportedSASLMechanisms) },
+       { "supportedFeatures", NULL, NULL, NULL,
+               offsetof(struct slap_internal_schema, si_ad_supportedFeatures) },
 
        /* subschema subentry attributes */
        { "attributeTypes", NULL, NULL, NULL,
@@ -201,15 +217,39 @@ struct slap_schema_ad_map {
 };
 
 static AttributeType slap_at_undefined = {
-       "UNDEFINED", /* cname */
        { "1.1.1", NULL, NULL, 1, NULL,
                NULL, NULL, NULL, NULL,
-               0, 0, 0, 1, 3 },
+               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
@@ -219,9 +259,6 @@ schema_prep( void )
        /* we should only be called once after schema_init() was called */
        assert( schema_init_done == 1 );
 
-       ucdata_load( global_ucdata_path ? global_ucdata_path :
-               SLAPD_DEFAULT_UCDATA, UCDATA_CASE|UCDATA_CTYPE|UCDATA_NUM );
-
        for( i=0; oc_map[i].ssom_name; i++ ) {
                ObjectClass ** ocp = (ObjectClass **)
                        &(((char *) &slap_schema)[oc_map[i].ssom_offset]);
@@ -268,6 +305,34 @@ schema_prep( void )
        }
        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;
 }