Use LDAP_MOD_SOFTADD instead of LDAP_MOD_ADD when adding the new rdn as

an attribute to the entry. This covers the case in which the rdn value
was already an attribute value for the entry in question.

diff --git a/servers/slapd/back-ldbm/modrdn.c b/servers/slapd/back-ldbm/modrdn.c
index fb38b6411814aa769edc6dda3804b2af7f9b1326..635e8dc84ec3df737e028342f05c7152a1e3ec32 100644 (file)
--- a/servers/slapd/back-ldbm/modrdn.c
+++ b/servers/slapd/back-ldbm/modrdn.c
@@ -185,9 +185,9 @@ ldbm_back_modrdn(
                add_bv.bv_val = new_rdn_val;
                add_bv.bv_len = strlen(new_rdn_val);
                
-               mod[0].mod_type = old_rdn_type; 
+               mod[0].mod_type = new_rdn_type; 
                mod[0].mod_bvalues = add_bvals;
-               mod[0].mod_op = LDAP_MOD_ADD;
+               mod[0].mod_op = LDAP_MOD_SOFTADD;
                mod[0].mod_next = NULL;
                
                Debug( LDAP_DEBUG_TRACE,