SLAPD_SCHEMA_NOT_COMPAT: Mostly working modrdn

diff --git a/servers/slapd/back-ldbm/modify.c b/servers/slapd/back-ldbm/modify.c
index 892507489d5fe5ea4144ffd6133d25caf8d8219c..00c11f07ec97b206429a0a40aa8c540f0164fc71 100644 (file)
--- a/servers/slapd/back-ldbm/modify.c
+++ b/servers/slapd/back-ldbm/modify.c
@@ -369,7 +369,8 @@ delete_values(
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
                        int match;
                        const char *text;
-                       int rc = value_match( &match, mod->sm_desc, NULL,
+                       int rc = value_match( &match, mod->sm_desc,
+                               mod->sm_desc->ad_type->sat_equality,
                                mod->sm_bvalues[i], a->a_vals[j], &text );
 
                        if( rc == LDAP_SUCCESS && match == 0 )

diff --git a/servers/slapd/back-ldbm/modrdn.c b/servers/slapd/back-ldbm/modrdn.c
index 83474d77874926bae740587bf4e390fa497a7f37..eeeea36b0e884dec1ee4884eb96afe6afb2c67a5 100644 (file)
--- a/servers/slapd/back-ldbm/modrdn.c
+++ b/servers/slapd/back-ldbm/modrdn.c
@@ -410,7 +410,7 @@ ldbm_back_modrdn(
                                const char *text;
 
                                mod[1].sml_desc = NULL;
-                               rc = slap_str2ad( old_rdn_type, &mod[0].sml_desc, &text );
+                               rc = slap_str2ad( old_rdn_type, &mod[1].sml_desc, &text );
 
                                if( rc != LDAP_SUCCESS ) {
                                        Debug( LDAP_DEBUG_TRACE,