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 4ba2607d8423a12de4bb90e4febb51c35cd07b52..e34914c15b371e6d043798006b6747b1420aacaf 100644 (file)
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -53,7 +53,7 @@ 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 );
@@ -217,15 +217,17 @@ 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 {