From: Juan Gomez <gomez@openldap.org>
Date: Wed, 26 May 1999 00:44:04 +0000 (+0000)
Subject: Use LDAP_MOD_SOFTADD instead of LDAP_MOD_ADD when adding the new rdn as
X-Git-Tag: OPENLDAP_REL_ENG_1_2_2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b2ec6405d70660135b94df882605881a11309ee;p=thirdparty%2Fopenldap.git

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 fb38b64118..635e8dc84e 100644
--- 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,