X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fdn2id.c;h=70bca2b43ea6ef243af2043d3ac67addef77a8ab;hb=6e9c21cff8fc740dc6ed21c6f64d9a8899a33401;hp=1be0a4bbfd240f187f0026c1b5b1c7ccabb06853;hpb=a1987ae99bf0f902bec94444b466d7c4061ef3b2;p=openldap diff --git a/servers/slapd/back-bdb/dn2id.c b/servers/slapd/back-bdb/dn2id.c index 1be0a4bbfd..70bca2b43e 100644 --- a/servers/slapd/back-bdb/dn2id.c +++ b/servers/slapd/back-bdb/dn2id.c @@ -12,6 +12,7 @@ #include "back-bdb.h" #include "idl.h" +#include "lutil.h" #ifndef BDB_HIER int @@ -25,19 +26,29 @@ bdb_dn2id_add( DB *db = bdb->bi_dn2id->bdi_db; int rc; DBT key, data; - char *buf, *ptr, *pdn; + char *buf; + struct berval ptr, pdn; +#ifdef NEW_LOGGING + LDAP_LOG ( INDEX, ARGS, "bdb_dn2id_add( \"%s\", 0x%08lx )\n", + e->e_ndn, (long) e->e_id, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_add( \"%s\", 0x%08lx )\n", e->e_ndn, (long) e->e_id, 0 ); +#endif assert( e->e_id != NOID ); DBTzero( &key ); key.size = e->e_nname.bv_len + 2; + key.ulen = key.size; + key.flags = DB_DBT_USERMEM; 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; @@ -46,71 +57,88 @@ bdb_dn2id_add( /* store it -- don't override */ rc = db->put( db, txn, &key, &data, DB_NOOVERWRITE ); if( rc != 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG ( INDEX, ERR, "bdb_dn2id_add: put failed: %s %d\n", + db_strerror(rc), rc, 0 ); +#else Debug( LDAP_DEBUG_ANY, "=> bdb_dn2id_add: put failed: %s %d\n", db_strerror(rc), rc, 0 ); +#endif goto done; } - if( !be_issuffix( be, ptr )) { + 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 ) { +#ifdef NEW_LOGGING + LDAP_LOG ( INDEX, ERR, + "=> bdb_dn2id_add: subtree (%s) insert failed: %d\n", + ptr.bv_val, rc, 0 ); +#else Debug( LDAP_DEBUG_ANY, "=> bdb_dn2id_add: subtree (%s) insert failed: %d\n", - ptr, rc, 0 ); + ptr.bv_val, rc, 0 ); +#endif goto done; } - rc = dnParent( ptr, (const char **)&pdn ); - if ( rc != LDAP_SUCCESS ) { - Debug( LDAP_DEBUG_ANY, - "=> bdb_dn2id_add: dnParent(\"%s\") failed\n", - ptr, 0, 0 ); - goto done; - } + dnParent( &ptr, &pdn ); - key.size -= pdn - ptr; - pdn[-1] = DN_ONE_PREFIX; - key.data = pdn - 1; + key.size = pdn.bv_len + 2; + key.ulen = key.size; + pdn.bv_val[-1] = DN_ONE_PREFIX; + key.data = pdn.bv_val-1; ptr = pdn; rc = bdb_idl_insert_key( be, db, txn, &key, e->e_id ); if( rc != 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG ( INDEX, ERR, + "=> bdb_dn2id_add: parent (%s) insert failed: %d\n", + ptr.bv_val, rc, 0 ); +#else Debug( LDAP_DEBUG_ANY, "=> bdb_dn2id_add: parent (%s) insert failed: %d\n", - ptr, rc, 0 ); + ptr.bv_val, rc, 0 ); +#endif goto done; } } - while( !be_issuffix( be, ptr )) { - ptr[-1] = DN_SUBTREE_PREFIX; + 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 ) { +#ifdef NEW_LOGGING + LDAP_LOG ( INDEX, ERR, + "=> bdb_dn2id_add: subtree (%s) insert failed: %d\n", + ptr.bv_val, rc, 0 ); +#else Debug( LDAP_DEBUG_ANY, "=> bdb_dn2id_add: subtree (%s) insert failed: %d\n", - ptr, rc, 0 ); + ptr.bv_val, rc, 0 ); +#endif break; } - rc = dnParent( ptr, &pdn ); - if ( rc != LDAP_SUCCESS ) { - Debug( LDAP_DEBUG_ANY, - "=> bdb_dn2id_add: dnParent(\"%s\") failed\n", - ptr, 0, 0 ); - goto done; - } + dnParent( &ptr, &pdn ); - key.size -= pdn - ptr; - key.data = pdn - 1; + key.size = pdn.bv_len + 2; + key.ulen = key.size; + key.data = pdn.bv_val - 1; ptr = pdn; } done: ch_free( buf ); +#ifdef NEW_LOGGING + LDAP_LOG ( INDEX, RESULTS, "<= bdb_dn2id_add: %d\n", rc, 0, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_add: %d\n", rc, 0, 0 ); +#endif return rc; } @@ -118,17 +146,23 @@ 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; +#ifdef NEW_LOGGING + LDAP_LOG ( INDEX, ARGS, + "=> bdb_dn2id_delete ( \"%s\", 0x%08lx )\n", e->e_ndn, e->e_id, 0); +#else Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_delete( \"%s\", 0x%08lx )\n", e->e_ndn, e->e_id, 0 ); +#endif DBTzero( &key ); key.size = e->e_nname.bv_len + 2; @@ -136,76 +170,96 @@ bdb_dn2id_delete( 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 ); if( rc != 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG ( INDEX, ERR, + "=> bdb_dn2id_delete: delete failed: %s %d\n", + db_strerror(rc), rc, 0 ); +#else Debug( LDAP_DEBUG_ANY, "=> bdb_dn2id_delete: delete failed: %s %d\n", db_strerror(rc), rc, 0 ); +#endif goto done; } - if( !be_issuffix( be, ptr )) { + if( !be_issuffix( be, &ptr )) { buf[0] = DN_SUBTREE_PREFIX; - rc = bdb_idl_delete_key( be, db, txn, &key, e->e_id ); + rc = db->del( db, txn, &key, 0 ); if( rc != 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG ( INDEX, ERR, + "=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n", + ptr.bv_val, rc, 0 ); +#else Debug( LDAP_DEBUG_ANY, "=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n", - ptr, rc, 0 ); + ptr.bv_val, rc, 0 ); +#endif goto done; } - rc = dnParent( ptr, &pdn ); - if ( rc != LDAP_SUCCESS ) { - Debug( LDAP_DEBUG_ANY, - "=> bdb_dn2id_delete: dnParent(\"%s\") failed\n", - ptr, 0, 0 ); - goto done; - } + dnParent( &ptr, &pdn ); - key.size -= pdn - ptr; - pdn[-1] = DN_ONE_PREFIX; - key.data = pdn - 1; + key.size = pdn.bv_len + 2; + key.ulen = key.size; + 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 ) { +#ifdef NEW_LOGGING + LDAP_LOG ( INDEX, ERR, + "=> bdb_dn2id_delete: parent (%s) delete failed: %d\n", + ptr.bv_val, rc, 0 ); +#else Debug( LDAP_DEBUG_ANY, "=> bdb_dn2id_delete: parent (%s) delete failed: %d\n", - ptr, rc, 0 ); + ptr.bv_val, rc, 0 ); +#endif goto done; } } - while( !be_issuffix( be, ptr )) { - ptr[-1] = DN_SUBTREE_PREFIX; + 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 ) { +#ifdef NEW_LOGGING + LDAP_LOG ( INDEX, ERR, + "=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n", + ptr.bv_val, rc, 0 ); +#else Debug( LDAP_DEBUG_ANY, "=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n", - ptr, rc, 0 ); - goto done; - } - rc = dnParent( ptr, &pdn ); - if ( rc != LDAP_SUCCESS ) { - Debug( LDAP_DEBUG_ANY, - "=> bdb_dn2id_delete: dnParent(\"%s\") failed\n", - ptr, 0, 0 ); + ptr.bv_val, rc, 0 ); +#endif goto done; } + dnParent( &ptr, &pdn ); - key.size -= pdn - ptr; - key.data = pdn - 1; + key.size = pdn.bv_len + 2; + key.ulen = key.size; + key.data = pdn.bv_val - 1; ptr = pdn; } done: ch_free( buf ); +#ifdef NEW_LOGGING + LDAP_LOG ( INDEX, RESULTS, "<= bdb_dn2id_delete %d\n", rc, 0, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_delete %d\n", rc, 0, 0 ); +#endif return rc; } @@ -214,14 +268,19 @@ bdb_dn2id( BackendDB *be, DB_TXN *txn, struct berval *dn, - ID *id ) + ID *id, + int flags ) { int rc; DBT key, data; struct bdb_info *bdb = (struct bdb_info *) be->be_private; DB *db = bdb->bi_dn2id->bdi_db; +#ifdef NEW_LOGGING + LDAP_LOG ( INDEX, ARGS, "=> bdb_dn2id( \"%s\" )\n", dn->bv_val, 0, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id( \"%s\" )\n", dn->bv_val, 0, 0 ); +#endif assert (id); @@ -243,14 +302,24 @@ bdb_dn2id( data.flags = DB_DBT_USERMEM; /* fetch it */ - rc = db->get( db, txn, &key, &data, bdb->bi_db_opflags ); + rc = db->get( db, txn, &key, &data, bdb->bi_db_opflags | flags); if( rc != 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG ( INDEX, ERR, "<= bdb_dn2id: get failed %s (%d)\n", + db_strerror(rc), rc, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id: get failed: %s (%d)\n", db_strerror( rc ), rc, 0 ); +#endif } else { +#ifdef NEW_LOGGING + LDAP_LOG ( INDEX, RESULTS, + "<= bdb_dn2id: got id=0x%08lx\n", *id, 0, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id: got id=0x%08lx\n", *id, 0, 0 ); +#endif } ch_free( key.data ); @@ -263,7 +332,8 @@ bdb_dn2id_matched( DB_TXN *txn, struct berval *in, ID *id, - ID *id2 ) + ID *id2, + int flags ) { int rc; DBT key, data; @@ -273,7 +343,12 @@ bdb_dn2id_matched( struct berval dn; ID cached_id; +#ifdef NEW_LOGGING + LDAP_LOG ( INDEX, ARGS, + "=> bdb_dn2id_matched( \"%s\" )\n", in->bv_val, 0, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_matched( \"%s\" )\n", in->bv_val, 0, 0 ); +#endif DBTzero( &key ); key.size = in->bv_len + 2; @@ -306,55 +381,70 @@ bdb_dn2id_matched( break; } else { /* fetch it */ - rc = db->get(db, txn, &key, &data, bdb->bi_db_opflags ); + rc = db->get(db, txn, &key, &data, bdb->bi_db_opflags | flags ); } if( rc == DB_NOTFOUND ) { - char *pdn = NULL; - - if ( ! be_issuffix( be, dn.bv_val ) ) { - rc = dnParent( dn.bv_val, &pdn ); - if ( rc != LDAP_SUCCESS ) { - Debug( LDAP_DEBUG_TRACE, - "<= bdb_dn2id_matched: dnParent(\"%s\") failed\n", - dn, 0, 0 ); - break; - } - } - - if( pdn == NULL || *pdn == '\0' ) { + struct berval pdn; + + if ( ! be_issuffix( be, &dn ) ) { + dnParent( &dn, &pdn ); + } else { +#ifdef NEW_LOGGING + LDAP_LOG ( INDEX, DETAIL1, + "<= bdb_dn2id_matched: no match\n", 0, 0, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_matched: no match\n", 0, 0, 0 ); +#endif break; } - key.size -= pdn - dn.bv_val; - dn.bv_val = pdn; - dn.bv_len = key.size - 2; - key.data = pdn - 1; + key.size = pdn.bv_len + 2; + dn = pdn; + key.data = pdn.bv_val - 1; } else if ( rc == 0 ) { if( data.size != sizeof( ID ) ) { +#ifdef NEW_LOGGING + LDAP_LOG ( INDEX, DETAIL1, + "<= bdb_dn2id_matched: get size mismatch:" + "expected %ld, got %ld\n", + (long) sizeof(ID), (long) data.size, 0 ); +#else Debug( LDAP_DEBUG_ANY, "<= bdb_dn2id_matched: get size mismatch: " "expected %ld, got %ld\n", (long) sizeof(ID), (long) data.size, 0 ); +#endif } if( dn.bv_val != buf+1 ) { *id2 = *id; } +#ifdef NEW_LOGGING + LDAP_LOG ( INDEX, DETAIL1, + "<= bdb_dn2id_matched: id=0x%08lx: %s %s\n", + (long) *id, *id2 == 0 ? "entry" : "matched", dn.bv_val ); +#else Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_matched: id=0x%08lx: %s %s\n", (long) *id, *id2 == 0 ? "entry" : "matched", dn.bv_val ); +#endif break; } else { +#ifdef NEW_LOGGING + LDAP_LOG ( INDEX, ERR, + "<= bdb_dn2id_matched: get failed: %s (%d)\n", + db_strerror(rc), rc, 0 ); +#else Debug( LDAP_DEBUG_ANY, "<= bdb_dn2id_matched: get failed: %s (%d)\n", db_strerror(rc), rc, 0 ); +#endif break; } } @@ -367,7 +457,8 @@ int bdb_dn2id_children( BackendDB *be, DB_TXN *txn, - struct berval *dn ) + struct berval *dn, + int flags ) { int rc; DBT key, data; @@ -375,8 +466,13 @@ bdb_dn2id_children( DB *db = bdb->bi_dn2id->bdi_db; ID id; +#ifdef NEW_LOGGING + LDAP_LOG ( INDEX, ARGS, + "=> bdb_dn2id_children( %s )\n", dn->bv_val, 0, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_children( %s )\n", dn->bv_val, 0, 0 ); +#endif DBTzero( &key ); key.size = dn->bv_len + 2; @@ -392,13 +488,20 @@ bdb_dn2id_children( data.doff = 0; data.dlen = sizeof(id); - rc = db->get( db, txn, &key, &data, bdb->bi_db_opflags ); + rc = db->get( db, txn, &key, &data, bdb->bi_db_opflags | flags ); free( key.data ); +#ifdef NEW_LOGGING + LDAP_LOG ( INDEX, DETAIL1, + "<= bdb_dn2id_children( %s ): %schildren (%d)\n", + dn->bv_val, rc == 0 ? "" : ( rc == DB_NOTFOUND ? "no " : + db_strerror(rc)), rc ); +#else Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_children( %s ): %schildren (%d)\n", dn->bv_val, rc == 0 ? "" : ( rc == DB_NOTFOUND ? "no " : db_strerror(rc) ), rc ); +#endif return rc; } @@ -415,9 +518,14 @@ bdb_dn2idl( struct bdb_info *bdb = (struct bdb_info *) be->be_private; DB *db = bdb->bi_dn2id->bdi_db; +#ifdef NEW_LOGGING + LDAP_LOG ( INDEX, ARGS, + "=> bdb_dn2ididl( \"%s\" )\n", dn->bv_val, 0, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2idl( \"%s\" )\n", dn->bv_val, 0, 0 ); +#endif - if (prefix == DN_SUBTREE_PREFIX && be_issuffix(be, dn->bv_val)) + if (prefix == DN_SUBTREE_PREFIX && be_issuffix(be, dn)) { BDB_IDL_ALL(bdb, ids); return 0; @@ -425,6 +533,8 @@ bdb_dn2idl( DBTzero( &key ); key.size = dn->bv_len + 2; + key.ulen = key.size; + key.flags = DB_DBT_USERMEM; key.data = ch_malloc( key.size ); ((char *)key.data)[0] = prefix; AC_MEMCPY( &((char *)key.data)[1], dn->bv_val, key.size - 1 ); @@ -432,15 +542,27 @@ bdb_dn2idl( rc = bdb_idl_fetch_key( be, db, NULL, &key, ids ); if( rc != 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG ( INDEX, ERR, + "<= bdb_dn2ididl: get failed: %s (%d)\n", db_strerror(rc), rc, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2idl: get failed: %s (%d)\n", db_strerror( rc ), rc, 0 ); +#endif } else { +#ifdef NEW_LOGGING + LDAP_LOG ( INDEX, RESULTS, + "<= bdb_dn2ididl: id=%ld first=%ld last=%ld\n", + (long) ids[0], (long) BDB_IDL_FIRST( ids ), + (long) BDB_IDL_LAST( ids ) ); +#else Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2idl: id=%ld first=%ld last=%ld\n", (long) ids[0], (long) BDB_IDL_FIRST( ids ), (long) BDB_IDL_LAST( ids ) ); +#endif } ch_free( key.data ); @@ -500,11 +622,11 @@ node_find_cmp( static int node_frdn_cmp( - char *nrdn, + struct berval *nrdn, idNode *n ) { - return strcmp(nrdn, n->i_rdn->nrdn.bv_val); + return ber_bvcmp(nrdn, &n->i_rdn->nrdn); } static int @@ -522,9 +644,6 @@ 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); } @@ -538,7 +657,7 @@ idNode * bdb_find_id_node( } idNode * bdb_find_rdn_node( - char *nrdn, + struct berval *nrdn, Avlnode *tree ) { @@ -595,12 +714,11 @@ int bdb_build_tree( ) { struct bdb_info *bdb = (struct bdb_info *) be->be_private; - int i, rc; + int rc; DBC *cursor; DBT key, data; ID id; idNode *node; - char **rdns; bdb->bi_tree = NULL; @@ -611,20 +729,6 @@ int bdb_build_tree( return NOID; } - /* When be_suffix is turned into struct berval or LDAPDN - * life will get a lot easier... Since no DNs live on disk, we - * need to operate on the be_suffix to fully qualify our DNs. - * We need to know how many components are in the suffix DN, - * so we can tell where the suffix ends and our nodes begin. - * - * Note that this code always uses be_suffix[0], so defining - * multiple suffixes for a single backend won't work! - */ - rdns = ldap_explode_dn(be->be_nsuffix[0]->bv_val, 0); - for (i=0; rdns[i]; i++); - bdb->bi_nrdns = i; - charray_free(rdns); - DBTzero( &key ); DBTzero( &data ); key.data = (char *)&id; @@ -659,8 +763,8 @@ int bdb_fix_dn( ldap_pvt_thread_rdwr_rlock(&bdb->bi_tree_rdwr); o = bdb_find_id_node(id, bdb->bi_tree); - rlen = be->be_suffix[0]->bv_len + 1; - nrlen = be->be_nsuffix[0]->bv_len + 1; + rlen = be->be_suffix[0].bv_len + 1; + nrlen = be->be_nsuffix[0].bv_len + 1; 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; @@ -672,15 +776,15 @@ int bdb_fix_dn( 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 = lutil_strcopy(ptr, n->i_rdn->rdn.bv_val); *ptr++ = ','; - nptr = slap_strcopy(nptr, n->i_rdn->nrdn.bv_val); + nptr = lutil_strcopy(nptr, n->i_rdn->nrdn.bv_val); *nptr++ = ','; } ldap_pvt_thread_rdwr_runlock(&bdb->bi_tree_rdwr); - strcpy(ptr, be->be_suffix[0]->bv_val); - strcpy(nptr, be->be_nsuffix[0]->bv_val); + strcpy(ptr, be->be_suffix[0].bv_val); + strcpy(nptr, be->be_nsuffix[0].bv_val); return 0; } @@ -719,7 +823,7 @@ bdb_dn2id_add( d->nrdn.bv_val -= (long)d; if (pdn->bv_len) { - bdb_dn2id(be, txn, pdn, &d->parent); + bdb_dn2id(be, txn, pdn, &d->parent, 0); } else { d->parent = 0; } @@ -776,7 +880,7 @@ bdb_dn2id_delete( if (n) { if (n->i_parent) { ldap_pvt_thread_rdwr_wlock(&n->i_parent->i_kids_rdwr); - avl_delete(&n->i_parent->i_kids, n->i_rdn->nrdn.bv_val, + avl_delete(&n->i_parent->i_kids, &n->i_rdn->nrdn, (AVL_CMP)node_frdn_cmp); ldap_pvt_thread_rdwr_wunlock(&n->i_parent->i_kids_rdwr); } @@ -797,40 +901,40 @@ bdb_dn2id_matched( DB_TXN *txn, struct berval *in, ID *id, - ID *id2 ) + ID *id2, + int flags ) { struct bdb_info *bdb = (struct bdb_info *) be->be_private; - int i; - char **rdns; + struct berval rdn; + char *p1, *p2; idNode *n, *p; if (!bdb->bi_troot) return DB_NOTFOUND; p = bdb->bi_troot; - if (be_issuffix(be, in->bv_val)) { + if (be_issuffix(be, in)) { *id = p->i_id; return 0; } - rdns = ldap_explode_dn(in->bv_val, 0); - for (i=0; rdns[i]; i++); - i -= bdb->bi_nrdns; - if (i < 0) { - charray_free(rdns); - return -1; - } + p1 = in->bv_val + in->bv_len - be->be_nsuffix[0].bv_len - 1; + n = p; ldap_pvt_thread_rdwr_rlock(&bdb->bi_tree_rdwr); - for (--i; i>=0; i--) { + for (;;) { + for (p2 = p1-1; (p2 >= in->bv_val) && !DN_SEPARATOR(*p2); p2--); + rdn.bv_val = p2+1; + rdn.bv_len = p1-rdn.bv_val; + p1 = p2; + ldap_pvt_thread_rdwr_rlock(&p->i_kids_rdwr); - n = bdb_find_rdn_node(rdns[i], p->i_kids); + n = bdb_find_rdn_node(&rdn, p->i_kids); ldap_pvt_thread_rdwr_runlock(&p->i_kids_rdwr); - if (!n) break; + if (!n || p2 < in->bv_val) break; p = n; } ldap_pvt_thread_rdwr_runlock(&bdb->bi_tree_rdwr); - charray_free(rdns); if (n) { *id = n->i_id; @@ -845,23 +949,25 @@ bdb_dn2id( BackendDB *be, DB_TXN *txn, struct berval *dn, - ID *id ) + ID *id, + int flags ) { - return bdb_dn2id_matched(be, txn, dn, id, NULL); + return bdb_dn2id_matched(be, txn, dn, id, NULL, flags); } int bdb_dn2id_children( BackendDB *be, DB_TXN *txn, - struct berval *dn ) + struct berval *dn, + int flags ) { int rc; struct bdb_info *bdb = (struct bdb_info *) be->be_private; ID id; idNode *n; - rc = bdb_dn2id(be, txn, dn, &id); + rc = bdb_dn2id(be, txn, dn, &id, flags); if (rc != 0) return rc; @@ -917,12 +1023,12 @@ bdb_dn2idl( ID id; idNode *n; - if (prefix == DN_SUBTREE_PREFIX && be_issuffix(be, dn->bv_val)) { + if (prefix == DN_SUBTREE_PREFIX && be_issuffix(be, dn)) { BDB_IDL_ALL(bdb, ids); return 0; } - rc = bdb_dn2id(be, NULL, dn, &id); + rc = bdb_dn2id(be, NULL, dn, &id, 0); if (rc) return rc; ldap_pvt_thread_rdwr_rlock(&bdb->bi_tree_rdwr);