X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fdn2id.c;h=b0bef02a1da63cc72b7be709601cdcf6c8a9d7bc;hb=6df9b5459294bcc9adf27f048508d43eea58a203;hp=bac5ff3586f10ec99b55a4ef19f7095fdd0548b3;hpb=fd93e0721b3073b3aa5092090f5379a10e40a65b;p=openldap

diff --git a/servers/slapd/back-bdb/dn2id.c b/servers/slapd/back-bdb/dn2id.c
index bac5ff3586..b0bef02a1d 100644
--- a/servers/slapd/back-bdb/dn2id.c
+++ b/servers/slapd/back-bdb/dn2id.c
@@ -1,7 +1,7 @@
 /* dn2id.c - routines to deal with the dn2id index */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -18,26 +18,29 @@ int
 bdb_dn2id_add(
 	BackendDB	*be,
 	DB_TXN *txn,
-	char *pdn,
+	struct berval	*pbv,
 	Entry		*e )
 {
 	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
 	DB *db = bdb->bi_dn2id->bdi_db;
 	int		rc;
 	DBT		key, data;
-	char		*buf, *ptr;
+	char		*buf;
+	struct berval	ptr, pdn;
 
 	Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_add( \"%s\", 0x%08lx )\n",
 		e->e_ndn, (long) e->e_id, 0 );
 	assert( e->e_id != NOID );
 
 	DBTzero( &key );
-	key.size = strlen( e->e_ndn ) + 2;
+	key.size = e->e_nname.bv_len + 2;
 	buf = ch_malloc( key.size );
 	key.data = buf;
 	buf[0] = DN_BASE_PREFIX;
-	ptr = buf + 1;
-	AC_MEMCPY( ptr, e->e_ndn, key.size - 1 );
+	ptr.bv_val = buf + 1;
+	ptr.bv_len = e->e_nname.bv_len;
+	AC_MEMCPY( ptr.bv_val, e->e_nname.bv_val, e->e_nname.bv_len );
+	ptr.bv_val[ptr.bv_len] = '\0';
 
 	DBTzero( &data );
 	data.data = (char *) &e->e_id;
@@ -51,62 +54,49 @@ bdb_dn2id_add(
 		goto done;
 	}
 
-	buf[0] = DN_SUBTREE_PREFIX;
-	rc = bdb_idl_insert_key( be, db, txn, &key, e->e_id );
-	if( rc != 0 ) {
-		Debug( LDAP_DEBUG_ANY,
-			"=> bdb_dn2id_add: subtree (%s) insert failed: %d\n",
-			ptr, rc, 0 );
-		goto done;
-	}
-
-	pdn = dn_parent( be, ptr );
-
-	if( pdn != NULL ) {
-		key.size -= pdn - ptr;
-		pdn[-1] = DN_ONE_PREFIX;
-		key.data = pdn - 1;
-
+	if( !be_issuffix( be, &ptr )) {
+		buf[0] = DN_SUBTREE_PREFIX;
 		rc = bdb_idl_insert_key( be, db, txn, &key, e->e_id );
-
 		if( rc != 0 ) {
 			Debug( LDAP_DEBUG_ANY,
-				"=> bdb_dn2id_add: parent (%s) insert failed: %d\n",
-					pdn, rc, 0 );
+			"=> bdb_dn2id_add: subtree (%s) insert failed: %d\n",
+			ptr.bv_val, rc, 0 );
 			goto done;
 		}
+		
+		dnParent( &ptr, &pdn );
+	
+		key.size = pdn.bv_len + 2;
+		pdn.bv_val[-1] = DN_ONE_PREFIX;
+		key.data = pdn.bv_val-1;
+		ptr = pdn;
 
-		pdn[-1] = DN_SUBTREE_PREFIX;
 		rc = bdb_idl_insert_key( be, db, txn, &key, e->e_id );
 
 		if( rc != 0 ) {
 			Debug( LDAP_DEBUG_ANY,
-				"=> bdb_dn2id_add: subtree (%s) insert failed: %d\n",
-					pdn, rc, 0 );
+				"=> bdb_dn2id_add: parent (%s) insert failed: %d\n",
+					ptr.bv_val, rc, 0 );
 			goto done;
 		}
-		ptr = pdn;
-		pdn = dn_parent( be, pdn );
 	}
 
-	while( pdn != NULL ) {
-		if( be_issuffix( be, pdn ))
-			break;
-
-		pdn[-1] = DN_SUBTREE_PREFIX;
-		key.size -= pdn - ptr;
-		key.data = pdn - 1;
+	while( !be_issuffix( be, &ptr )) {
+		ptr.bv_val[-1] = DN_SUBTREE_PREFIX;
 
 		rc = bdb_idl_insert_key( be, db, txn, &key, e->e_id );
 
 		if( rc != 0 ) {
 			Debug( LDAP_DEBUG_ANY,
 				"=> bdb_dn2id_add: subtree (%s) insert failed: %d\n",
-					pdn, rc, 0 );
+					ptr.bv_val, rc, 0 );
 			break;
 		}
+		dnParent( &ptr, &pdn );
+
+		key.size = pdn.bv_len + 2;
+		key.data = pdn.bv_val - 1;
 		ptr = pdn;
-		pdn = dn_parent( be, pdn );
 	}
 
 done:
@@ -119,26 +109,29 @@ int
 bdb_dn2id_delete(
 	BackendDB	*be,
 	DB_TXN *txn,
-	char	*pdn,
+	char	*pdnc,
 	Entry		*e )
 {
 	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
 	DB *db = bdb->bi_dn2id->bdi_db;
 	int		rc;
 	DBT		key;
-	char		*buf, *ptr;
+	char		*buf;
+	struct berval	pdn, ptr;
 
 	Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_delete( \"%s\", 0x%08lx )\n",
 		e->e_ndn, e->e_id, 0 );
 
 	DBTzero( &key );
-	key.size = strlen( e->e_ndn ) + 2;
+	key.size = e->e_nname.bv_len + 2;
 	buf = ch_malloc( key.size );
 	key.data = buf;
 	key.flags = DB_DBT_USERMEM;
 	buf[0] = DN_BASE_PREFIX;
-	ptr = buf+1;
-	AC_MEMCPY( ptr, e->e_ndn, key.size - 1 );
+	ptr.bv_val = buf+1;
+	ptr.bv_len = e->e_nname.bv_len;
+	AC_MEMCPY( ptr.bv_val, e->e_nname.bv_val, e->e_nname.bv_len );
+	ptr.bv_val[ptr.bv_len] = '\0';
 
 	/* delete it */
 	rc = db->del( db, txn, &key, 0 );
@@ -148,62 +141,48 @@ bdb_dn2id_delete(
 		goto done;
 	}
 
-	buf[0] = DN_SUBTREE_PREFIX;
-	rc = bdb_idl_delete_key( be, db, txn, &key, e->e_id );
-	if( rc != 0 ) {
-		Debug( LDAP_DEBUG_ANY,
-			"=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n",
-			ptr, rc, 0 );
-		goto done;
-	}
-
-	pdn = dn_parent( be, ptr );
-
-	if( pdn != NULL ) {
-		key.size -= pdn - ptr;
-		pdn[-1] = DN_ONE_PREFIX;
-		key.data = pdn - 1;
-
+	if( !be_issuffix( be, &ptr )) {
+		buf[0] = DN_SUBTREE_PREFIX;
 		rc = bdb_idl_delete_key( be, db, txn, &key, e->e_id );
-
 		if( rc != 0 ) {
 			Debug( LDAP_DEBUG_ANY,
-				"=> bdb_dn2id_delete: parent (%s) delete failed: %d\n",
-				pdn, rc, 0 );
+			"=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n",
+			ptr.bv_val, rc, 0 );
 			goto done;
 		}
 
-		pdn[-1] = DN_SUBTREE_PREFIX;
+		dnParent( &ptr, &pdn );
+
+		key.size = pdn.bv_len + 2;
+		pdn.bv_val[-1] = DN_ONE_PREFIX;
+		key.data = pdn.bv_val - 1;
+		ptr = pdn;
 
 		rc = bdb_idl_delete_key( be, db, txn, &key, e->e_id );
 
 		if( rc != 0 ) {
 			Debug( LDAP_DEBUG_ANY,
-				"=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n",
-				pdn, rc, 0 );
+				"=> bdb_dn2id_delete: parent (%s) delete failed: %d\n",
+				ptr.bv_val, rc, 0 );
 			goto done;
 		}
-		ptr = pdn;
-		pdn = dn_parent( be, pdn );
 	}
 
-	while( pdn != NULL ) {
-		if( be_issuffix( be, pdn ))
-			break;
-
-		pdn[-1] = DN_SUBTREE_PREFIX;
-		key.size -= pdn - ptr;
-		key.data = pdn - 1;
+	while( !be_issuffix( be, &ptr )) {
+		ptr.bv_val[-1] = DN_SUBTREE_PREFIX;
 
 		rc = bdb_idl_delete_key( be, db, txn, &key, e->e_id );
 		if( rc != 0 ) {
 			Debug( LDAP_DEBUG_ANY,
 				"=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n",
-				pdn, rc, 0 );
+				ptr.bv_val, rc, 0 );
 			goto done;
 		}
+		dnParent( &ptr, &pdn );
+
+		key.size = pdn.bv_len + 2;
+		key.data = pdn.bv_val - 1;
 		ptr = pdn;
-		pdn = dn_parent( be, pdn );
 	}
 
 done:
@@ -216,7 +195,7 @@ int
 bdb_dn2id(
 	BackendDB	*be,
 	DB_TXN *txn,
-	const char	*dn,
+	struct berval	*dn,
 	ID *id )
 {
 	int		rc;
@@ -224,13 +203,20 @@ bdb_dn2id(
 	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
 	DB *db = bdb->bi_dn2id->bdi_db;
 
-	Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id( \"%s\" )\n", dn, 0, 0 );
+	Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id( \"%s\" )\n", dn->bv_val, 0, 0 );
+
+	assert (id);
+ 
+	*id = bdb_cache_find_entry_ndn2id(be, &bdb->bi_cache, dn);
+	if (*id != NOID) {
+		return 0;
+	}
 
 	DBTzero( &key );
-	key.size = strlen( dn ) + 2;
+	key.size = dn->bv_len + 2;
 	key.data = ch_malloc( key.size );
 	((char *)key.data)[0] = DN_BASE_PREFIX;
-	AC_MEMCPY( &((char *)key.data)[1], dn, key.size - 1 );
+	AC_MEMCPY( &((char *)key.data)[1], dn->bv_val, key.size - 1 );
 
 	/* store the ID */
 	DBTzero( &data );
@@ -257,22 +243,27 @@ int
 bdb_dn2id_matched(
 	BackendDB	*be,
 	DB_TXN *txn,
-	const char	*in,
+	struct berval	*in,
 	ID *id,
-	char **matchedDN )
+	ID *id2 )
 {
 	int		rc;
 	DBT		key, data;
 	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
 	DB *db = bdb->bi_dn2id->bdi_db;
-	const char *dn = in;
+	char 		*buf;
+	struct	berval dn;
+	ID		cached_id;
 
-	Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_matched( \"%s\" )\n", dn, 0, 0 );
+	Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_matched( \"%s\" )\n", in->bv_val, 0, 0 );
 
 	DBTzero( &key );
-	key.size = strlen( dn ) + 2;
-	key.data = ch_malloc( key.size );
-	((char *)key.data)[0] = DN_BASE_PREFIX;
+	key.size = in->bv_len + 2;
+	buf = ch_malloc( key.size );
+	key.data = buf;
+	dn.bv_val = buf+1;
+	dn.bv_len = key.size - 2;
+	AC_MEMCPY( dn.bv_val, in->bv_val, key.size - 1 );
 
 	/* store the ID */
 	DBTzero( &data );
@@ -280,28 +271,41 @@ bdb_dn2id_matched(
 	data.ulen = sizeof(ID);
 	data.flags = DB_DBT_USERMEM;
 
-	*matchedDN = NULL;
-
 	while(1) {
-		AC_MEMCPY( &((char *)key.data)[1], dn, key.size - 1 );
+		dn.bv_val[-1] = DN_BASE_PREFIX;
 
 		*id = NOID;
 
-		/* fetch it */
-		rc = db->get( db, txn, &key, &data, bdb->bi_db_opflags );
+		/* lookup cache */
+		cached_id = bdb_cache_find_entry_ndn2id(be, &bdb->bi_cache, &dn);
+ 
+		if (cached_id != NOID) {
+			rc = 0;
+			*id = cached_id;
+			if ( dn.bv_val != buf+1 ) {
+				*id2 = *id;
+			}
+			break;
+		} else {
+			/* fetch it */
+			rc = db->get(db, txn, &key, &data, bdb->bi_db_opflags );
+		}
 
 		if( rc == DB_NOTFOUND ) {
-			char *pdn = dn_parent( be, dn );
+			struct berval 	pdn;
 
-			if( pdn == NULL || *pdn == '\0' ) {
+			if ( ! be_issuffix( be, &dn ) ) {
+				dnParent( &dn, &pdn );
+			} else {
 				Debug( LDAP_DEBUG_TRACE,
 					"<= bdb_dn2id_matched: no match\n",
 					0, 0, 0 );
 				break;
 			}
 
+			key.size = pdn.bv_len + 2;
 			dn = pdn;
-			key.size = strlen( dn ) + 2;
+			key.data = pdn.bv_val - 1;
 
 		} else if ( rc == 0 ) {
 			if( data.size != sizeof( ID ) ) {
@@ -311,13 +315,13 @@ bdb_dn2id_matched(
 					(long) sizeof(ID), (long) data.size, 0 );
 			}
 
-			if( in != dn ) {
-				*matchedDN = (char *) dn;
+			if( dn.bv_val != buf+1 ) {
+				*id2 = *id;
 			}
 
 			Debug( LDAP_DEBUG_TRACE,
 				"<= bdb_dn2id_matched: id=0x%08lx: %s %s\n",
-				(long) *id, *matchedDN == NULL ? "entry" : "matched", dn );
+				(long) *id, *id2 == 0 ? "entry" : "matched", dn.bv_val );
 			break;
 
 		} else {
@@ -328,7 +332,7 @@ bdb_dn2id_matched(
 		}
 	}
 
-	ch_free( key.data );
+	ch_free( buf );
 	return rc;
 }
 
@@ -336,7 +340,7 @@ int
 bdb_dn2id_children(
 	BackendDB	*be,
 	DB_TXN *txn,
-	const char *dn )
+	struct berval *dn )
 {
 	int		rc;
 	DBT		key, data;
@@ -345,13 +349,13 @@ bdb_dn2id_children(
 	ID		id;
 
 	Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_children( %s )\n",
-		dn, 0, 0 );
+		dn->bv_val, 0, 0 );
 
 	DBTzero( &key );
-	key.size = strlen( dn ) + 2;
+	key.size = dn->bv_len + 2;
 	key.data = ch_malloc( key.size );
 	((char *)key.data)[0] = DN_ONE_PREFIX;
-	AC_MEMCPY( &((char *)key.data)[1], dn, key.size - 1 );
+	AC_MEMCPY( &((char *)key.data)[1], dn->bv_val, key.size - 1 );
 
 	/* we actually could do a empty get... */
 	DBTzero( &data );
@@ -362,9 +366,10 @@ bdb_dn2id_children(
 	data.dlen = sizeof(id);
 
 	rc = db->get( db, txn, &key, &data, bdb->bi_db_opflags );
+	free( key.data );
 
 	Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_children( %s ): %schildren (%d)\n",
-		dn,
+		dn->bv_val,
 		rc == 0 ? "" : ( rc == DB_NOTFOUND ? "no " :
 			db_strerror(rc) ), rc );
 
@@ -374,16 +379,16 @@ bdb_dn2id_children(
 int
 bdb_dn2idl(
 	BackendDB	*be,
-	const char	*dn,
+	struct berval	*dn,
 	int prefix,
 	ID *ids )
 {
 	int		rc;
-	DBT		key, data;
+	DBT		key;
 	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
 	DB *db = bdb->bi_dn2id->bdi_db;
 
-	Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2idl( \"%s\" )\n", dn, 0, 0 );
+	Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2idl( \"%s\" )\n", dn->bv_val, 0, 0 );
 
 	if (prefix == DN_SUBTREE_PREFIX && be_issuffix(be, dn))
 	{
@@ -392,10 +397,10 @@ bdb_dn2idl(
 	}
 
 	DBTzero( &key );
-	key.size = strlen( dn ) + 2;
+	key.size = dn->bv_len + 2;
 	key.data = ch_malloc( key.size );
 	((char *)key.data)[0] = prefix;
-	AC_MEMCPY( &((char *)key.data)[1], dn, key.size - 1 );
+	AC_MEMCPY( &((char *)key.data)[1], dn->bv_val, key.size - 1 );
 
 	rc = bdb_idl_fetch_key( be, db, NULL, &key, ids );
 
@@ -452,22 +457,6 @@ typedef struct idNode {
 	ldap_pvt_thread_rdwr_t i_kids_rdwr;
 } idNode;
 
-/* strcopy is like strcpy except it returns a pointer to the trailing NUL of
- * the result string. This allows fast construction of catenated strings
- * without the overhead of strlen/strcat.
- */
-char *
-bdb_strcopy(
-	char *a,
-	char *b
-)
-{
-	if (!a || !b)
-		return a;
-	
-	while (*a++ = *b++) ;
-	return a-1;
-}
 
 /* The main AVL tree is sorted in ID order. The i_kids AVL trees are
  * sorted in lexical order. These are the various helper routines used
@@ -506,7 +495,11 @@ node_rdn_cmp(
 	idNode *b
 )
 {
+#if 0
 	return strcmp(a->i_rdn->nrdn.bv_val, b->i_rdn->nrdn.bv_val);
+#endif
+	/* should be slightly better without ordering drawbacks */
+	return ber_bvcmp(&a->i_rdn->nrdn, &b->i_rdn->nrdn);
 }
 
 idNode * bdb_find_id_node(
@@ -600,8 +593,6 @@ int bdb_build_tree(
 	 * Note that this code always uses be_suffix[0], so defining
 	 * multiple suffixes for a single backend won't work!
 	 */
-	bdb->bi_sufflen = strlen(be->be_suffix[0]);
-
 	rdns = ldap_explode_dn(be->be_nsuffix[0]->bv_val, 0);
 	for (i=0; rdns[i]; i++);
 	bdb->bi_nrdns = i;
@@ -641,27 +632,27 @@ int bdb_fix_dn(
 	
 	ldap_pvt_thread_rdwr_rlock(&bdb->bi_tree_rdwr);
 	o = bdb_find_id_node(id, bdb->bi_tree);
-	rlen = bdb->bi_sufflen + 1;
+	rlen = be->be_suffix[0]->bv_len + 1;
 	nrlen = be->be_nsuffix[0]->bv_len + 1;
-	for (n = o; n; n=n->i_parent) {
+	for (n = o; n && n->i_parent; n=n->i_parent) {
 		rlen += n->i_rdn->rdn.bv_len + 1;
 		nrlen += n->i_rdn->nrdn.bv_len + 1;
 	}
-	e->e_dn = ch_malloc(rlen + nrlen);
-	e->e_ndn = e->e_dn + rlen;
-	ptr = e->e_dn;
-	nptr = e->e_ndn;
-	for (n = o; n; n=n->i_parent) {
-		ptr = bdb_strcopy(ptr, n->i_rdn->rdn.bv_val);
+	e->e_name.bv_len = rlen - 1;
+	e->e_nname.bv_len = nrlen - 1;
+	e->e_name.bv_val = ch_malloc(rlen + nrlen);
+	e->e_nname.bv_val = e->e_name.bv_val + rlen;
+	ptr = e->e_name.bv_val;
+	nptr = e->e_nname.bv_val;
+	for (n = o; n && n->i_parent; n=n->i_parent) {
+		ptr = slap_strcopy(ptr, n->i_rdn->rdn.bv_val);
 		*ptr++ = ',';
-		nptr = bdb_strcopy(nptr, n->i_rdn->nrdn.bv_val);
+		nptr = slap_strcopy(nptr, n->i_rdn->nrdn.bv_val);
 		*nptr++ = ',';
 	}
 	ldap_pvt_thread_rdwr_runlock(&bdb->bi_tree_rdwr);
 
-	ptr--;
-	nptr--;
-	strcpy(ptr, be->be_suffix[0]);
+	strcpy(ptr, be->be_suffix[0]->bv_val);
 	strcpy(nptr, be->be_nsuffix[0]->bv_val);
 
 	return 0;
@@ -671,7 +662,7 @@ int
 bdb_dn2id_add(
 	BackendDB	*be,
 	DB_TXN *txn,
-	char	*pdn,
+	struct berval	*pdn,
 	Entry		*e )
 {
 	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
@@ -681,8 +672,12 @@ bdb_dn2id_add(
 	diskNode *d;
 	idNode *n;
 
-	nrlen = dn_rdnlen( be, e->e_ndn );
-	rlen = dn_rdnlen( be, e->e_dn );
+	nrlen = dn_rdnlen( be, &e->e_nname );
+	if (nrlen) {
+		rlen = dn_rdnlen( be, &e->e_name );
+	} else {
+		rlen = 0;
+	}
 
 	d = ch_malloc(sizeof(diskNode) + rlen + nrlen + 2);
 	d->rdn.bv_len = rlen;
@@ -696,7 +691,7 @@ bdb_dn2id_add(
 	d->rdn.bv_val -= (long)d;
 	d->nrdn.bv_val -= (long)d;
 
-	if (pdn) {
+	if (pdn->bv_len) {
 		bdb_dn2id(be, txn, pdn, &d->parent);
 	} else {
 		d->parent = 0;
@@ -773,9 +768,9 @@ int
 bdb_dn2id_matched(
 	BackendDB	*be,
 	DB_TXN *txn,
-	const char	*in,
+	struct berval	*in,
 	ID *id,
-	char **matchedDN )
+	ID *id2 )
 {
 	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
 	int		i;
@@ -791,11 +786,13 @@ bdb_dn2id_matched(
 		return 0;
 	}
 
-	rdns = ldap_explode_dn(in, 0);
+	rdns = ldap_explode_dn(in->bv_val, 0);
 	for (i=0; rdns[i]; i++);
 	i -= bdb->bi_nrdns;
-	if (i < 0)
+	if (i < 0) {
+		charray_free(rdns);
 		return -1;
+	}
 	n = p;
 	ldap_pvt_thread_rdwr_rlock(&bdb->bi_tree_rdwr);
 	for (--i; i>=0; i--) {
@@ -806,22 +803,12 @@ bdb_dn2id_matched(
 		p = n;
 	}
 	ldap_pvt_thread_rdwr_runlock(&bdb->bi_tree_rdwr);
+	charray_free(rdns);
 
 	if (n) {
 		*id = n->i_id;
-	} else if (matchedDN) {
-		int len = 0, j;
-		char *ptr;
-		++i;
-		for (j=i; rdns[j]; j++)
-			len += strlen(rdns[j]) + 1;
-		ptr = ch_malloc(len);
-		*matchedDN = ptr;
-		for (;rdns[i]; i++) {
-			ptr = bdb_strcopy(ptr, rdns[i]);
-			*ptr++ = ',';
-		}
-		ptr[-1] = '\0';
+	} else if (id2) {
+		*id2 = p->i_id;
 	}
 	return n ? 0 : DB_NOTFOUND;
 }
@@ -830,7 +817,7 @@ int
 bdb_dn2id(
 	BackendDB	*be,
 	DB_TXN *txn,
-	const char	*dn,
+	struct berval	*dn,
 	ID *id )
 {
 	return bdb_dn2id_matched(be, txn, dn, id, NULL);
@@ -840,7 +827,7 @@ int
 bdb_dn2id_children(
 	BackendDB	*be,
 	DB_TXN *txn,
-	const char *dn )
+	struct berval	*dn )
 {
 	int		rc;
 	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
@@ -894,7 +881,7 @@ insert_sub(
 int
 bdb_dn2idl(
 	BackendDB	*be,
-	const char	*dn,
+	struct berval	*dn,
 	int prefix,
 	ID *ids )
 {