X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldbm%2Fmodrdn.c;h=de0d99b8868636fcc41b9b8f76a508a019f8d84c;hb=426ca14a868b6edb638b48e14593542a365fcc4b;hp=4120263fa4db62c3db24bdf7811996bdf06e798d;hpb=a40b1f3126c74d860acdb3689568f3960100c954;p=openldap

diff --git a/servers/slapd/back-ldbm/modrdn.c b/servers/slapd/back-ldbm/modrdn.c
index 4120263fa4..de0d99b886 100644
--- a/servers/slapd/back-ldbm/modrdn.c
+++ b/servers/slapd/back-ldbm/modrdn.c
@@ -1,6 +1,7 @@
 /* modrdn.c - ldbm backend modrdn routine */
+/* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -33,463 +34,626 @@
 
 int
 ldbm_back_modrdn(
-    Backend	*be,
-    Connection	*conn,
     Operation	*op,
-    char	*dn,
-    char	*newrdn,
-    int		deleteoldrdn,
-    char	*newSuperior
-)
+    SlapReply	*rs )
 {
-	struct ldbminfo	*li = (struct ldbminfo *) be->be_private;
-	char		*p_dn = NULL, *p_ndn = NULL;
-	char		*new_dn = NULL, *new_ndn = NULL;
+	AttributeDescription *children = slap_schema.si_ad_children;
+	AttributeDescription *entry = slap_schema.si_ad_entry;
+	struct ldbminfo	*li = (struct ldbminfo *) op->o_bd->be_private;
+	struct berval	p_dn, p_ndn;
+	struct berval	new_dn = { 0, NULL}, new_ndn = { 0, NULL };
 	Entry		*e, *p = NULL;
-	Entry		*matched = NULL;
-	int			rootlock = 0;
-	int			rc = -1;
-	/* Added to support LDAP v2 correctly (deleteoldrdn thing) */
-	char		*new_rdn_val = NULL;	/* Val of new rdn */
-	char		*new_rdn_type = NULL;	/* Type of new rdn */
-	char		*old_rdn;		/* Old rdn's attr type & val */
-	char		*old_rdn_type = NULL;	/* Type of old rdn attr. */
-	char		*old_rdn_val = NULL;	/* Old rdn attribute value */
+	Entry		*matched;
+	/* LDAP v2 supporting correct attribute handling. */
+	LDAPRDN		*new_rdn = NULL;
+	LDAPRDN		*old_rdn = NULL;
+	int		isroot = -1;
+#define CAN_ROLLBACK	-1
+#define MUST_DESTROY	1
+	int		rc = CAN_ROLLBACK;
+	int 		rc_id = 0;
+	ID              id = NOID;
+	const char	*text = NULL;
+	char		textbuf[SLAP_TEXT_BUFLEN];
+	size_t		textlen = sizeof textbuf;
 	/* Added to support newSuperior */ 
 	Entry		*np = NULL;	/* newSuperior Entry */
-	char		*np_dn = NULL;  /* newSuperior dn */
-	char		*np_ndn = NULL; /* newSuperior ndn */
-	char		*new_parent_dn = NULL;	/* np_dn, p_dn, or NULL */
+	struct berval	*np_ndn = NULL; /* newSuperior ndn */
+	struct berval	*new_parent_dn = NULL;	/* np_dn, p_dn, or NULL */
 	/* Used to interface with ldbm_modify_internal() */
-	struct berval	add_bv;			/* Stores new rdn att */
-	struct berval	*add_bvals[2];		/* Stores new rdn att */
-	struct berval	del_bv;			/* Stores old rdn att */
-	struct berval	*del_bvals[2];		/* Stores old rdn att */
-	LDAPModList	mod[2];			/* Used to delete old rdn */
+	Modifications	*mod = NULL;		/* Used to delete old/add new rdn */
 	int		manageDSAit = get_manageDSAit( op );
 
-	Debug( LDAP_DEBUG_TRACE, "==>ldbm_back_modrdn(newSuperior=%s)\n",
-	       (newSuperior ? newSuperior : "NULL"),
-	       0, 0 );
+#ifdef NEW_LOGGING
+	LDAP_LOG( BACK_LDBM, ENTRY, 
+		"ldbm_back_modrdn: dn: %s newSuperior=%s\n", 
+		op->o_req_dn.bv_len ? op->o_req_dn.bv_val : "NULL",
+		( op->oq_modrdn.rs_newSup && op->oq_modrdn.rs_newSup->bv_len ) ? op->oq_modrdn.rs_newSup->bv_val : "NULL",0 );
+#else
+	Debug( LDAP_DEBUG_TRACE,
+		"==>ldbm_back_modrdn: dn: %s newSuperior=%s\n", 
+		op->o_req_dn.bv_len ? op->o_req_dn.bv_val : "NULL",
+		( op->oq_modrdn.rs_newSup && op->oq_modrdn.rs_newSup->bv_len )
+			? op->oq_modrdn.rs_newSup->bv_val : "NULL", 0 );
+#endif
+
+	/* grab giant lock for writing */
+	ldap_pvt_thread_rdwr_wlock(&li->li_giant_rwlock);
 
 	/* get entry with writer lock */
-	if ( (e = dn2entry_w( be, dn, &matched )) == NULL ) {
-		char* matched_dn = NULL;
-		struct berval** refs = NULL;
-
+	if ( (e = dn2entry_w( op->o_bd, &op->o_req_ndn, &matched )) == NULL ) {
 		if( matched != NULL ) {
-			matched_dn = strdup( matched->e_dn );
-			refs = is_entry_referral( matched )
-				? get_entry_referrals( be, conn, op, matched )
+			rs->sr_matched = strdup( matched->e_dn );
+			rs->sr_ref = is_entry_referral( matched )
+				? get_entry_referrals( op, matched )
 				: NULL;
 			cache_return_entry_r( &li->li_cache, matched );
 		} else {
-			refs = default_referral;
+			rs->sr_ref = referral_rewrite( default_referral,
+				NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT );
 		}
 
-		send_ldap_result( conn, op, LDAP_REFERRAL,
-			matched_dn, NULL, refs, NULL );
+		ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
 
-		if ( matched != NULL ) {
-			ber_bvecfree( refs );
-			free( matched_dn );
-		}
+		rs->sr_err = LDAP_REFERRAL;
+		send_ldap_result( op, rs );
+
+		if ( rs->sr_ref ) ber_bvarray_free( rs->sr_ref );
+		free( (char *)rs->sr_matched );
 
 		return( -1 );
 	}
 
-#ifdef SLAPD_CHILD_MODIFICATION_WITH_ENTRY_ACL
-	if ( ! access_allowed( be, conn, op, e,
-		"entry", NULL, ACL_WRITE ) )
+	/* check entry for "entry" acl */
+	if ( ! access_allowed( op, e,
+		entry, NULL, ACL_WRITE, NULL ) )
 	{
-		Debug( LDAP_DEBUG_TRACE, "no access to entry\n", 0,
+#ifdef NEW_LOGGING
+		LDAP_LOG( BACK_LDBM, ERR, 
+			"ldbm_back_modrdn: no write access to entry of (%s)\n", 
+			dn->bv_val, 0, 0 );
+#else
+		Debug( LDAP_DEBUG_TRACE,
+			"<=- ldbm_back_modrdn: no write access to entry\n", 0,
 			0, 0 );
-		send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
-			NULL, NULL, NULL, NULL );
+#endif
+
+		send_ldap_error( op, rs, LDAP_INSUFFICIENT_ACCESS,
+			"no write access to entry" );
+
 		goto return_results;
 	}
-#endif
 
 	if (!manageDSAit && is_entry_referral( e ) ) {
 		/* parent is a referral, don't allow add */
 		/* parent is an alias, don't allow add */
-		struct berval **refs = get_entry_referrals( be,
-			conn, op, e );
+		rs->sr_ref = get_entry_referrals( op, e );
 
-		Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0,
+#ifdef NEW_LOGGING
+		LDAP_LOG( BACK_LDBM, INFO, 
+			"ldbm_back_modrdn: entry %s is a referral\n", e->e_dn, 0, 0 );
+#else
+		Debug( LDAP_DEBUG_TRACE, "entry %s is referral\n", e->e_dn,
 		    0, 0 );
+#endif
+
+		rs->sr_err = LDAP_REFERRAL;
+		rs->sr_matched = e->e_name.bv_val;
+		send_ldap_result( op, rs );
 
-		send_ldap_result( conn, op, LDAP_REFERRAL,
-		    e->e_dn, NULL, refs, NULL );
+		if ( rs->sr_ref ) ber_bvarray_free( rs->sr_ref );
+		goto return_results;
+	}
 
-		ber_bvecfree( refs );
+	if ( has_children( op->o_bd, e ) ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( BACK_LDBM, INFO, 
+			"ldbm_back_modrdn: entry %s has children\n", e->e_dn, 0, 0 );
+#else
+		Debug( LDAP_DEBUG_TRACE, "entry %s has children\n", e->e_dn,
+		    0, 0 );
+#endif
 
+		send_ldap_error( op, rs, LDAP_NOT_ALLOWED_ON_NONLEAF,
+		    "subtree rename not supported" );
 		goto return_results;
 	}
 
-	if ( (p_ndn = dn_parent( be, e->e_ndn )) != NULL ) {
+	if ( be_issuffix( op->o_bd, &e->e_nname ) ) {
+		p_ndn = slap_empty_bv ;
+	} else {
+		dnParent( &e->e_nname, &p_ndn );
+	}
 
+	if ( p_ndn.bv_len != 0 ) {
 		/* Make sure parent entry exist and we can write its 
 		 * children.
 		 */
 
-		if( (p = dn2entry_w( be, p_ndn, &matched )) == NULL) {
+		if( (p = dn2entry_w( op->o_bd, &p_ndn, NULL )) == NULL) {
+#ifdef NEW_LOGGING
+			LDAP_LOG( BACK_LDBM, INFO, 
+				"ldbm_back_modrdn: parent of %s does not exist\n", 
+				e->e_ndn, 0, 0 );
+#else
 			Debug( LDAP_DEBUG_TRACE, "parent does not exist\n",
 				0, 0, 0);
-			send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
-				NULL, NULL, NULL, NULL );
+#endif
+
+			send_ldap_error( op, rs, LDAP_OTHER,
+				"parent entry does not exist" );
+
 			goto return_results;
 		}
 
 		/* check parent for "children" acl */
-		if ( ! access_allowed( be, conn, op, p,
-			"children", NULL, ACL_WRITE ) )
+		if ( ! access_allowed( op, p,
+			children, NULL, ACL_WRITE, NULL ) )
 		{
+#ifdef NEW_LOGGING
+			LDAP_LOG( BACK_LDBM, INFO, 
+				"ldbm_back_modrdn: no access to parent of (%s)\n", 
+				e->e_dn, 0, 0 );
+#else
 			Debug( LDAP_DEBUG_TRACE, "no access to parent\n", 0,
 				0, 0 );
-			send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
-				NULL, NULL, NULL, NULL );
+#endif
+
+			send_ldap_error( op, rs, LDAP_INSUFFICIENT_ACCESS,
+				NULL );
 			goto return_results;
 		}
 
+#ifdef NEW_LOGGING
+		LDAP_LOG( BACK_LDBM, DETAIL1, 
+			"ldbm_back_modrdn: wr to children of entry %s OK\n", 
+			p_ndn.bv_val, 0, 0 );
+#else
 		Debug( LDAP_DEBUG_TRACE,
 		       "ldbm_back_modrdn: wr to children of entry %s OK\n",
-		       p_ndn, 0, 0 );
-		
-		p_dn = dn_parent( be, e->e_dn );
-	
+		       p_ndn.bv_val, 0, 0 );
+#endif
+
+		if ( p_ndn.bv_val == slap_empty_bv.bv_val ) {
+			p_dn = slap_empty_bv;
+		} else {
+			dnParent( &e->e_name, &p_dn );
+		}
 
+#ifdef NEW_LOGGING
+		LDAP_LOG( BACK_LDBM, DETAIL1, 
+			   "ldbm_back_modrdn: parent dn=%s\n", p_dn.bv_val, 0, 0 );
+#else
 		Debug( LDAP_DEBUG_TRACE, "ldbm_back_modrdn: parent dn=%s\n",
-		       p_dn, 0, 0 );
+		       p_dn.bv_val, 0, 0 );
+#endif
 
 	} else {
-		/* no parent, modrdn entry directly under root */
-		if( ! be_isroot( be, op->o_ndn ) ) {
-			Debug( LDAP_DEBUG_TRACE, "no parent & not root\n",
-				0, 0, 0);
-			send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
-				NULL, NULL, NULL, NULL );
-			goto return_results;
+		/* no parent, must be root to modify rdn */
+		isroot = be_isroot( op->o_bd, &op->o_ndn );
+		if ( ! isroot ) {
+			if ( be_issuffix( op->o_bd, (struct berval *)&slap_empty_bv ) || be_isupdate( op->o_bd, &op->o_ndn ) ) {
+				int	can_access;
+				p = (Entry *)&slap_entry_root;
+				
+				can_access = access_allowed( op, p,
+						children, NULL, ACL_WRITE, NULL );
+				p = NULL;
+								
+				/* check parent for "children" acl */
+				if ( ! can_access ) {
+#ifdef NEW_LOGGING
+					LDAP_LOG( BACK_LDBM, ERR,
+						"ldbm_back_modrdn: no access to parent \"\"\n", 0,0,0 );
+#else
+					Debug( LDAP_DEBUG_TRACE,
+						"<=- ldbm_back_modrdn: no "
+						"access to parent\n", 0, 0, 0 );
+#endif
+
+					send_ldap_error( op, rs,
+						LDAP_INSUFFICIENT_ACCESS,
+						NULL );
+					goto return_results;
+				}
+
+			} else {
+#ifdef NEW_LOGGING
+				LDAP_LOG( BACK_LDBM, ERR, 
+					"ldbm_back_modrdn: (%s) has no parent & not a root.\n", 
+					dn, 0, 0 );
+#else
+				Debug( LDAP_DEBUG_TRACE,
+					"<=- ldbm_back_modrdn: no parent & "
+					"not root\n", 0, 0, 0);
+#endif
+
+				send_ldap_error( op, rs,
+					LDAP_INSUFFICIENT_ACCESS,
+					NULL );
+				goto return_results;
+			}
 		}
 
-		ldap_pvt_thread_mutex_lock(&li->li_root_mutex);
-		rootlock = 1;
-		
+#ifdef NEW_LOGGING
+		LDAP_LOG( BACK_LDBM, INFO, 
+		   "ldbm_back_modrdn: (%s) no parent, locked root.\n", e->e_dn, 0, 0 );
+#else
 		Debug( LDAP_DEBUG_TRACE,
 		       "ldbm_back_modrdn: no parent, locked root\n",
 		       0, 0, 0 );
-
+#endif
 	}
 
-	new_parent_dn = p_dn;	/* New Parent unless newSuperior given */
+	new_parent_dn = &p_dn;	/* New Parent unless newSuperior given */
 
-	if ( (np_dn = newSuperior) != NULL) {
+	if ( op->oq_modrdn.rs_newSup != NULL ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( BACK_LDBM, DETAIL1, 
+			"ldbm_back_modrdn: new parent \"%s\" requested\n",
+			op->oq_modrdn.rs_newSup->bv_val, 0, 0 );
+#else
 		Debug( LDAP_DEBUG_TRACE, 
-		       "ldbm_back_modrdn: new parent requested...\n",
-		       0, 0, 0 );
+			"ldbm_back_modrdn: new parent \"%s\" requested...\n",
+			op->oq_modrdn.rs_newSup->bv_val, 0, 0 );
+#endif
 
-		np_ndn = ch_strdup( np_dn );
-		(void) dn_normalize_case( np_ndn );
+		np_ndn = op->oq_modrdn.rs_nnewSup;
+
+		/* newSuperior == oldParent? */
+		if ( dn_match( &p_ndn, np_ndn ) ) {
+#ifdef NEW_LOGGING
+			LDAP_LOG( BACK_LDBM, INFO, "ldbm_back_modrdn: "
+				"new parent\"%s\" seems to be the same as the "
+				"old parent \"%s\"\n", op->oq_modrdn.rs_newSup->bv_val, p_dn.bv_val, 0 );
+#else
+			Debug( LDAP_DEBUG_TRACE, "ldbm_back_modrdn: "
+				"new parent\"%s\" seems to be the same as the "
+				"old parent \"%s\"\n",
+				op->oq_modrdn.rs_newSup->bv_val, p_dn.bv_val, 0 );
+#endif
 
-		/* newSuperior == oldParent?, if so ==> ERROR */
+			op->oq_modrdn.rs_newSup = NULL; /* ignore newSuperior */
+		}
+	}
+
+	if ( op->oq_modrdn.rs_newSup != NULL ) {
 		/* newSuperior == entry being moved?, if so ==> ERROR */
 		/* Get Entry with dn=newSuperior. Does newSuperior exist? */
 
-		if( (np = dn2entry_w( be, np_ndn, &matched )) == NULL) {
-			Debug( LDAP_DEBUG_TRACE,
-			       "ldbm_back_modrdn: newSup(ndn=%s) not here!\n",
-			       np_ndn, 0, 0);
-			send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
-				NULL, NULL, NULL, NULL );
-			goto return_results;
-		}
+		if ( op->oq_modrdn.rs_nnewSup->bv_len ) {
+			if( (np = dn2entry_w( op->o_bd, np_ndn, NULL )) == NULL) {
+#ifdef NEW_LOGGING
+				LDAP_LOG( BACK_LDBM, ERR, 
+					"ldbm_back_modrdn: newSup(ndn=%s) not found.\n", 
+					np_ndn->bv_val, 0, 0 );
+#else
+				Debug( LDAP_DEBUG_TRACE,
+				    "ldbm_back_modrdn: newSup(ndn=%s) not here!\n",
+				    np_ndn->bv_val, 0, 0);
+#endif
 
-		Debug( LDAP_DEBUG_TRACE,
-		       "ldbm_back_modrdn: wr to new parent OK np=%p, id=%d\n",
-		       np, np->e_id, 0 );
-	    
-		/* check newSuperior for "children" acl */
-		if ( !access_allowed( be, conn, op, np, "children", NULL,
-				      ACL_WRITE ) )
-		{
+				send_ldap_error( op, rs, LDAP_OTHER,
+					"newSuperior not found" );
+				goto return_results;
+			}
+
+#ifdef NEW_LOGGING
+			LDAP_LOG( BACK_LDBM, DETAIL1,
+				"ldbm_back_modrdn: wr to new parent OK np=%p, id=%ld\n",
+				np, np->e_id, 0 );
+#else
 			Debug( LDAP_DEBUG_TRACE,
-			       "ldbm_back_modrdn: no wr to newSup children\n",
-			       0, 0, 0 );
-			send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
-				NULL, NULL, NULL, NULL );
-			goto return_results;
-		}
+				"ldbm_back_modrdn: wr to new parent OK np=%p, id=%ld\n",
+				np, np->e_id, 0 );
+#endif
 
-		if ( is_entry_alias( np ) ) {
-			/* entry is an alias, don't allow bind */
-			Debug( LDAP_DEBUG_TRACE, "entry is alias\n", 0,
-			    0, 0 );
+			/* check newSuperior for "children" acl */
+			if ( !access_allowed( op, np, children, NULL,
+					      ACL_WRITE, NULL ) )
+			{
+#ifdef NEW_LOGGING
+				LDAP_LOG( BACK_LDBM, INFO,
+				   "ldbm_back_modrdn: no wr to newSup children.\n", 0, 0, 0 );
+#else
+				Debug( LDAP_DEBUG_TRACE,
+				       "ldbm_back_modrdn: no wr to newSup children\n",
+				       0, 0, 0 );
+#endif
 
-			send_ldap_result( conn, op, LDAP_ALIAS_PROBLEM,
-			    NULL, NULL, NULL, NULL );
+				send_ldap_error( op, rs, LDAP_INSUFFICIENT_ACCESS, NULL );
+				goto return_results;
+			}
 
-			goto return_results;
-		}
+			if ( is_entry_alias( np ) ) {
+				/* parent is an alias, don't allow add */
+#ifdef NEW_LOGGING
+				LDAP_LOG( BACK_LDBM, INFO,
+				   "ldbm_back_modrdn: entry (%s) is an alias.\n", np->e_dn,0,0);
+#else
+				Debug( LDAP_DEBUG_TRACE, "entry is alias\n", 0, 0, 0 );
+#endif
 
-		if ( is_entry_referral( np ) ) {
-			/* parent is a referral, don't allow add */
-			/* parent is an alias, don't allow add */
-			Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0,
-				0, 0 );
 
-			send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
-			    NULL, NULL, NULL, NULL );
+				send_ldap_error( op, rs, LDAP_ALIAS_PROBLEM,
+				    "newSuperior is an alias" );
 
-			goto return_results;
+				goto return_results;
+			}
+
+			if ( is_entry_referral( np ) ) {
+				/* parent is a referral, don't allow add */
+#ifdef NEW_LOGGING
+				LDAP_LOG( BACK_LDBM, INFO,
+					"ldbm_back_modrdn: entry (%s) is a referral\n",
+					np->e_dn, 0, 0 );
+#else
+				Debug( LDAP_DEBUG_TRACE, "entry (%s) is referral\n",
+					np->e_dn, 0, 0 );
+#endif
+
+				send_ldap_error( op, rs, LDAP_OTHER,
+				    "newSuperior is a referral" );
+
+				goto return_results;
+			}
+
+		} else {
+
+			/* no parent, must be root to modify newSuperior */
+			if ( isroot == -1 ) {
+				isroot = be_isroot( op->o_bd, &op->o_ndn );
+			}
+
+			if ( ! isroot ) {
+				if ( be_issuffix( op->o_bd, (struct berval *)&slap_empty_bv ) || be_isupdate( op->o_bd, &op->o_ndn ) ) {
+					int	can_access;
+					np = (Entry *)&slap_entry_root;
+				
+					can_access = access_allowed( op, np,
+							children, NULL, ACL_WRITE, NULL );
+					np = NULL;
+								
+					/* check parent for "children" acl */
+					if ( ! can_access ) {
+#ifdef NEW_LOGGING
+						LDAP_LOG( BACK_LDBM, ERR,
+							"ldbm_back_modrdn: no access "
+							"to new superior \"\"\n", 0, 0, 0 );
+#else
+						Debug( LDAP_DEBUG_TRACE,
+							"<=- ldbm_back_modrdn: no "
+							"access to new superior\n", 0, 0, 0 );
+#endif
+
+						send_ldap_error( op, rs,
+							LDAP_INSUFFICIENT_ACCESS,
+							NULL );
+						goto return_results;
+					}
+
+				} else {
+#ifdef NEW_LOGGING
+					LDAP_LOG( BACK_LDBM, ERR,
+						"ldbm_back_modrdn: \"\" not allowed as new superior\n",
+						0, 0, 0 );
+#else
+					Debug( LDAP_DEBUG_TRACE,
+						"<=- ldbm_back_modrdn: \"\" "
+						"not allowed as new superior\n", 
+						0, 0, 0);
+#endif
+
+					send_ldap_error( op, rs,
+						LDAP_INSUFFICIENT_ACCESS,
+						NULL );
+					goto return_results;
+				}
+			}
 		}
 
+#ifdef NEW_LOGGING
+		LDAP_LOG( BACK_LDBM, DETAIL1,
+			"ldbm_back_modrdn: wr to new parent's children OK.\n", 0, 0, 0 );
+#else
 		Debug( LDAP_DEBUG_TRACE,
-		       "ldbm_back_modrdn: wr to new parent's children OK\n",
-		       0, 0 , 0 );
+		    "ldbm_back_modrdn: wr to new parent's children OK\n",
+		    0, 0, 0 );
+#endif
 
-		new_parent_dn = np_dn;
+		new_parent_dn = op->oq_modrdn.rs_newSup;
 	}
 	
 	/* Build target dn and make sure target entry doesn't exist already. */
+	build_new_dn( &new_dn, new_parent_dn, &op->oq_modrdn.rs_newrdn ); 
+	dnNormalize2( NULL, &new_dn, &new_ndn );
 
-	build_new_dn( &new_dn, e->e_dn, new_parent_dn, newrdn ); 
-
-
-	new_ndn = ch_strdup(new_dn);
-	(void) dn_normalize_case( new_ndn );
-
+#ifdef NEW_LOGGING
+	LDAP_LOG( BACK_LDBM, DETAIL1, "ldbm_back_modrdn: new ndn=%s\n", 
+		new_ndn.bv_val, 0, 0 );
+#else
 	Debug( LDAP_DEBUG_TRACE, "ldbm_back_modrdn: new ndn=%s\n",
-	       new_ndn, 0, 0 );
+	    new_ndn.bv_val, 0, 0 );
+#endif
 
-	if (dn2id ( be, new_ndn ) != NOID) {
-		send_ldap_result( conn, op, LDAP_ALREADY_EXISTS,
-			NULL, NULL, NULL, NULL );
+	/* check for abandon */
+	if ( op->o_abandon ) {
 		goto return_results;
 	}
 
-	Debug( LDAP_DEBUG_TRACE,
-	       "ldbm_back_modrdn: new ndn=%s does not exist\n",
-	       new_ndn, 0, 0 );
-
-	/* check for abandon */
-	ldap_pvt_thread_mutex_lock( &op->o_abandonmutex );
-	if ( op->o_abandon ) {
-		ldap_pvt_thread_mutex_unlock( &op->o_abandonmutex );
+	if ( ( rc_id = dn2id ( op->o_bd, &new_ndn, &id ) ) || id != NOID ) {
+		/* if (rc_id) something bad happened to ldbm cache */
+		rs->sr_err = rc_id ? LDAP_OTHER : LDAP_ALREADY_EXISTS;
+		send_ldap_result( op, rs );
 		goto return_results;
 	}
-	ldap_pvt_thread_mutex_unlock( &op->o_abandonmutex );
+
+#ifdef NEW_LOGGING
+	LDAP_LOG( BACK_LDBM, INFO, "ldbm_back_modrdn: new ndn (%s) does not exist\n",
+		new_ndn.bv_val, 0, 0 );
+#else
+	Debug( LDAP_DEBUG_TRACE,
+	    "ldbm_back_modrdn: new ndn=%s does not exist\n",
+	    new_ndn.bv_val, 0, 0 );
+#endif
 
 	/* Get attribute type and attribute value of our new rdn, we will
 	 * need to add that to our new entry
 	 */
-
-	if ( (new_rdn_type = rdn_attr_type( newrdn )) == NULL ) {
-	    
-		Debug( LDAP_DEBUG_TRACE,
-		       "ldbm_back_modrdn: can't figure out type of newrdn\n",
-		       0, 0, 0 );
-		send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
-			NULL, NULL, NULL, NULL );
-		goto return_results;		
-
-	}
-
-	if ( (new_rdn_val = rdn_attr_value( newrdn )) == NULL ) {
-	    
+	if ( ldap_bv2rdn( &op->oq_modrdn.rs_newrdn, &new_rdn, (char **)&rs->sr_text,
+		LDAP_DN_FORMAT_LDAP ) )
+	{
+#ifdef NEW_LOGGING
+		LDAP_LOG ( OPERATION, ERR, 
+			"ldbm_back_modrdn: can't figure out "
+			"type(s)/values(s) of newrdn\n", 
+			0, 0, 0 );
+#else
 		Debug( LDAP_DEBUG_TRACE,
-		       "ldbm_back_modrdn: can't figure out val of newrdn\n",
-		       0, 0, 0 );
-		send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
-			NULL, NULL, NULL, NULL );
+			"ldbm_back_modrdn: can't figure out "
+			"type(s)/values(s) of newrdn\n", 
+			0, 0, 0 );
+#endif
 		goto return_results;		
-
 	}
 
+#ifdef NEW_LOGGING
+	LDAP_LOG ( OPERATION, RESULTS, 
+		"ldbm_back_modrdn: new_rdn_type=\"%s\", "
+		"new_rdn_val=\"%s\"\n",
+		new_rdn[ 0 ][ 0 ]->la_attr.bv_val, 
+		new_rdn[ 0 ][ 0 ]->la_value.bv_val, 0 );
+#else
 	Debug( LDAP_DEBUG_TRACE,
-	       "ldbm_back_modrdn: new_rdn_val=\"%s\", new_rdn_type=\"%s\"\n",
-	       new_rdn_val, new_rdn_type, 0 );
-
-	/* Retrieve the old rdn from the entry's dn */
-
-	if ( (old_rdn = dn_rdn( be, dn )) == NULL ) {
-
-		Debug( LDAP_DEBUG_TRACE,
-		       "ldbm_back_modrdn: can't figure out old_rdn from dn\n",
-		       0, 0, 0 );
-		send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
-			NULL, NULL, NULL, NULL );
-		goto return_results;		
-
-	}
+		"ldbm_back_modrdn: new_rdn_type=\"%s\", "
+		"new_rdn_val=\"%s\"\n",
+		new_rdn[ 0 ][ 0 ]->la_attr.bv_val,
+		new_rdn[ 0 ][ 0 ]->la_value.bv_val, 0 );
+#endif
 
-	if ( (old_rdn_type = rdn_attr_type( old_rdn )) == NULL ) {
-	    
-		Debug( LDAP_DEBUG_TRACE,
-		       "ldbm_back_modrdn: can't figure out the old_rdn type\n",
-		       0, 0, 0 );
-		send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
-			NULL, NULL, NULL, NULL );
-		goto return_results;		
-		
+	if ( op->oq_modrdn.rs_deleteoldrdn ) {
+		if ( ldap_bv2rdn( &op->o_req_dn, &old_rdn, (char **)&rs->sr_text,
+			LDAP_DN_FORMAT_LDAP ) )
+		{
+#ifdef NEW_LOGGING
+			LDAP_LOG ( OPERATION, ERR, 
+				"ldbm_back_modrdn: can't figure out "
+				"type(s)/values(s) of old_rdn\n", 
+				0, 0, 0 );
+#else
+			Debug( LDAP_DEBUG_TRACE,
+				"ldbm_back_modrdn: can't figure out "
+				"the old_rdn type(s)/value(s)\n", 
+				0, 0, 0 );
+#endif
+			goto return_results;		
+		}
 	}
-	
-	if ( strcasecmp( old_rdn_type, new_rdn_type ) != 0 ) {
-
-	    /* Not a big deal but we may say something */
-	    Debug( LDAP_DEBUG_TRACE,
-		   "ldbm_back_modrdn: old_rdn_type=%s, new_rdn_type=%s!\n",
-		   old_rdn_type, new_rdn_type, 0 );
-	    
-	}		
 
-#ifdef DNS_DN
-	if ( dn_type( old_rdn ) == DN_X500 ) {
+#ifdef NEW_LOGGING
+	LDAP_LOG( BACK_LDBM, DETAIL1, "ldbm_back_modrdn:  DN_X500\n", 0, 0, 0 );
+#else
+	Debug( LDAP_DEBUG_TRACE, "ldbm_back_modrdn: DN_X500\n",
+	       0, 0, 0 );
 #endif
-
-		Debug( LDAP_DEBUG_TRACE, "ldbm_back_modrdn: DN_X500\n",
-		       0, 0, 0 );
-		
-		/* Add new attribute value to the entry.
-		 */
-
-		add_bvals[0] = &add_bv;		/* Array of bervals */
-		add_bvals[1] = NULL;
-
-		add_bv.bv_val = new_rdn_val;
-		add_bv.bv_len = strlen(new_rdn_val);
-		
-		mod[0].ml_type = new_rdn_type;	
-		mod[0].ml_bvalues = add_bvals;
-		mod[0].ml_op = LDAP_MOD_SOFTADD;
-		mod[0].ml_next = NULL;
-
-		/* Remove old rdn value if required */
-
-		if (deleteoldrdn) {
-			/* Get value of old rdn */
 	
-			if ((old_rdn_val = rdn_attr_value( old_rdn ))
-			    == NULL) {
-			    
-				Debug( LDAP_DEBUG_TRACE,
-				       "ldbm_back_modrdn: can't figure out old_rdn_val from old_rdn\n",
-				       0, 0, 0 );
-				send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
-					NULL, NULL, NULL, NULL );
-				goto return_results;		
-			}
-
-			del_bvals[0] = &del_bv;		/* Array of bervals */
-			del_bvals[1] = NULL;
-
-			/* Remove old value of rdn as an attribute. */
-		    
-			del_bv.bv_val = old_rdn_val;
-			del_bv.bv_len = strlen(old_rdn_val);
+	if ( slap_modrdn2mods( op, rs, e, old_rdn, new_rdn, &mod ) != LDAP_SUCCESS ) {
+		goto return_results;
+	}
 
-			/* No need to normalize old_rdn_type, delete_values()
-			 * does that for us
-			 */
-			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;
-			mod[1].ml_next = NULL;
 
-			Debug( LDAP_DEBUG_TRACE,
-			       "ldbm_back_modrdn: removing old_rdn_val=%s\n",
-			       old_rdn_val, 0, 0 );
-		}
-	
-#ifdef DNS_DN
-	} else {
-		Debug( LDAP_DEBUG_TRACE, "ldbm_back_modrdn: DNS DN\n",
-		       0, 0, 0 );
-		/* XXXV3: not sure of what to do here */
-		Debug( LDAP_DEBUG_TRACE,
-		       "ldbm_back_modrdn: not fully implemented...\n",
-		       0, 0, 0 );
-  
-		send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
-			NULL, NULL, NULL, NULL );
+	/* check for abandon */
+	if ( op->o_abandon ) {
 		goto return_results;
-
 	}
-#endif
 
 	/* delete old one */
-	if ( dn2id_delete( be, e->e_ndn, e->e_id ) != 0 ) {
-		send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
-			NULL, NULL, NULL, NULL );
+	if ( dn2id_delete( op->o_bd, &e->e_nname, e->e_id ) != 0 ) {
+		send_ldap_error( op, rs, LDAP_OTHER,
+			"DN index delete fail" );
 		goto return_results;
 	}
 
 	(void) cache_delete_entry( &li->li_cache, e );
+	rc = MUST_DESTROY;
+
+	/* XXX: there is no going back! */
+
 	free( e->e_dn );
 	free( e->e_ndn );
-	e->e_dn = new_dn;
-	e->e_ndn = new_ndn;
+	e->e_name = new_dn;
+	e->e_nname = new_ndn;
+	new_dn.bv_val = NULL;
+	new_ndn.bv_val = NULL;
+
+	/* NOTE: after this you must not free new_dn or new_ndn!
+	 * They are used by cache.
+	 */
 
 	/* add new one */
-	if ( dn2id_add( be, e->e_ndn, e->e_id ) != 0 ) {
-		send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
-			NULL, NULL, NULL, NULL );
+	if ( dn2id_add( op->o_bd, &e->e_nname, e->e_id ) != 0 ) {
+		send_ldap_error( op, rs, LDAP_OTHER,
+			"DN index add failed" );
 		goto return_results;
 	}
 
-
 	/* modify memory copy of entry */
-	if ( ldbm_modify_internal( be, conn, op, dn, &mod[0], e )
-	     != 0 ) {
-	    
-	    goto return_results;
+	rc_id = ldbm_modify_internal( op, &mod[0], e,
+		&rs->sr_text, textbuf, textlen );
+	switch ( rc_id ) {
+	case LDAP_SUCCESS:
+		break;
+
+	case SLAPD_ABANDON:
+		/* too late ... */
+		rs->sr_err = rc_id;
+		send_ldap_result( op, rs );
+		goto return_results;
+	
+	default:
+		/* here we may try to delete the newly added dn */
+		if ( dn2id_delete( op->o_bd, &e->e_nname, e->e_id ) != 0 ) {
+			/* we already are in trouble ... */
+			;
+		}
+    		goto return_results;
 	}
 	
 	(void) cache_update_entry( &li->li_cache, e );
 
-	/* NOTE: after this you must not free new_dn or new_ndn!
-	 * They are used by cache.
-	 */
-
 	/* id2entry index */
-	if ( id2entry_add( be, e ) != 0 ) {
-		entry_free( e );
-		send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
-			NULL, NULL, NULL, NULL );
-		goto return_results_after;
+	if ( id2entry_add( op->o_bd, e ) != 0 ) {
+		send_ldap_error( op, rs, LDAP_OTHER,
+			"entry update failed" );
+		goto return_results;
 	}
 
-	send_ldap_result( conn, op, LDAP_SUCCESS,
-		NULL, NULL, NULL, NULL );
+	rs->sr_err = LDAP_SUCCESS;
+	send_ldap_result( op, rs );
 	rc = 0;
-	goto return_results_after;	
+	cache_entry_commit( e );
 
 return_results:
-	if( new_dn != NULL ) free( new_dn );
-	if( new_ndn != NULL ) free( new_ndn );
-
-return_results_after:
-	/* NOTE:
-	 * new_dn and new_ndn are not deallocated because they are used by
-	 * the cache entry.
-	 */
-	if( p_dn != NULL ) free( p_dn );
-	if( p_ndn != NULL ) free( p_ndn );
-
-	if( matched != NULL ) free( matched );
+	if( new_dn.bv_val != NULL ) free( new_dn.bv_val );
+	if( new_ndn.bv_val != NULL ) free( new_ndn.bv_val );
 
 	/* LDAP v2 supporting correct attribute handling. */
-	if( new_rdn_type != NULL ) free(new_rdn_type);
-	if( new_rdn_val != NULL ) free(new_rdn_val);
-	if( old_rdn != NULL ) free(old_rdn);
-	if( old_rdn_type != NULL ) free(old_rdn_type);
-	if( old_rdn_val != NULL ) free(old_rdn_val);
-
+	if ( new_rdn != NULL ) {
+		ldap_rdnfree( new_rdn );
+	}
+	if ( old_rdn != NULL ) {
+		ldap_rdnfree( old_rdn );
+	}
+	if ( mod != NULL ) {
+		Modifications *tmp;
+		for (; mod; mod = tmp ) {
+			if ( mod->sml_nvalues ) free( mod->sml_nvalues[0].bv_val );
+			tmp = mod->sml_next;
+			free( mod );
+		}
+	}
 
 	/* LDAP v3 Support */
-	if ( np_dn != NULL ) free( np_dn );
-	if ( np_ndn != NULL ) free( np_ndn );
-
 	if( np != NULL ) {
 		/* free new parent and writer lock */
 		cache_return_entry_w( &li->li_cache, np );
@@ -500,12 +664,14 @@ return_results_after:
 		cache_return_entry_w( &li->li_cache, p );
 	}
 
-	if ( rootlock ) {
-		/* release root writer lock */
-		ldap_pvt_thread_mutex_unlock(&li->li_root_mutex);
-	}
-
 	/* free entry and writer lock */
 	cache_return_entry_w( &li->li_cache, e );
+	if ( rc == MUST_DESTROY ) {
+		/* if rc == MUST_DESTROY the entry is uncached 
+		 * and its private data is destroyed; 
+		 * the entry must be freed */
+		entry_free( e );
+	}
+	ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
 	return( rc );
 }