From: Juan Gomez <gomez@openldap.org>
Date: Wed, 26 May 1999 11:59:54 +0000 (+0000)
Subject: Added fix to allow modrdn whose new rdn was already an attr value.
X-Git-Tag: OPENLDAP_REL_ENG_2_BP~540
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=128f31dc3c89fa0bbd2e978510b273ca138dc67b;p=openldap

Added fix to allow modrdn whose new rdn was already an attr value.
---

diff --git a/servers/slapd/back-ldbm/modrdn.c b/servers/slapd/back-ldbm/modrdn.c
index a303ffb56f..5a606acb9b 100644
--- a/servers/slapd/back-ldbm/modrdn.c
+++ b/servers/slapd/back-ldbm/modrdn.c
@@ -315,9 +315,9 @@ ldbm_back_modrdn(
 		add_bv.bv_val = new_rdn_val;
 		add_bv.bv_len = strlen(new_rdn_val);
 		
-		mod[0].ml_type = old_rdn_type;	
+		mod[0].ml_type = new_rdn_type;	
 		mod[0].ml_bvalues = add_bvals;
-		mod[0].ml_op = LDAP_MOD_ADD | LDAP_MOD_BVALUES;
+		mod[0].ml_op = LDAP_MOD_SOFTADD;
 		mod[0].ml_next = NULL;
 
 		/* Remove old rdn value if required */
@@ -354,7 +354,7 @@ ldbm_back_modrdn(
 			mod[0].ml_next = &mod[1];
 			mod[1].ml_type = old_rdn_type;	
 			mod[1].ml_bvalues = del_bvals;
-			mod[1].ml_op = LDAP_MOD_DELETE | LDAP_MOD_BVALUES;
+			mod[1].ml_op = LDAP_MOD_DELETE;
 			mod[1].ml_next = NULL;
 
 			Debug( LDAP_DEBUG_TRACE,