Add start of discussion of strings in LDAP/X.500 and OpenLDAP.

[openldap] / servers / slapd / back-bdb / dn2id.c

diff --git a/servers/slapd/back-bdb/dn2id.c b/servers/slapd/back-bdb/dn2id.c
index 6511e6706bbb08cf17a29c3d3f294c65d5ba2614..4e8d02cd60aab4b6439f1344fdb8379d78de9ad8 100644 (file)
--- a/servers/slapd/back-bdb/dn2id.c
+++ b/servers/slapd/back-bdb/dn2id.c
@@ -29,8 +29,8 @@ bdb_dn2id_add(
        struct berval   ptr, pdn;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "db2id", LDAP_LEVEL_ARGS, "bdb_dn2id_add( \"%s\", 0x%08lx )\n",
-               e->e_ndn, (long) e->e_id ));
+       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 );
@@ -39,6 +39,8 @@ bdb_dn2id_add(
 
        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;
@@ -55,9 +57,8 @@ bdb_dn2id_add(
        rc = db->put( db, txn, &key, &data, DB_NOOVERWRITE );
        if( rc != 0 ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "db2id", LDAP_LEVEL_ERR, 
-                       "bdb_dn2id_add: put failed: %s %d\n",
-                       db_strerror(rc), rc ));
+               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 );
@@ -70,9 +71,9 @@ bdb_dn2id_add(
                rc = bdb_idl_insert_key( be, db, txn, &key, e->e_id );
                if( rc != 0 ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG (( "db2id", LDAP_LEVEL_ERR, 
-                       "=> bdb_dn2id_add: subtree (%s) insert failed: %d\n",
-                       ptr.bv_val, rc ));
+                       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",
@@ -84,6 +85,7 @@ bdb_dn2id_add(
                dnParent( &ptr, &pdn );
        
                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;
@@ -92,9 +94,9 @@ bdb_dn2id_add(
 
                if( rc != 0 ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG (( "db2id", LDAP_LEVEL_ERR, 
+                       LDAP_LOG ( INDEX, ERR, 
                                "=> bdb_dn2id_add: parent (%s) insert failed: %d\n",
-                               ptr.bv_val, rc ));
+                               ptr.bv_val, rc, 0 );
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "=> bdb_dn2id_add: parent (%s) insert failed: %d\n",
@@ -111,9 +113,9 @@ bdb_dn2id_add(
 
                if( rc != 0 ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG (( "db2id", LDAP_LEVEL_ERR, 
+                       LDAP_LOG ( INDEX, ERR, 
                                "=> bdb_dn2id_add: subtree (%s) insert failed: %d\n",
-                               ptr.bv_val, rc ));
+                               ptr.bv_val, rc, 0 );
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "=> bdb_dn2id_add: subtree (%s) insert failed: %d\n",
@@ -124,6 +126,7 @@ bdb_dn2id_add(
                dnParent( &ptr, &pdn );
 
                key.size = pdn.bv_len + 2;
+               key.ulen = key.size;
                key.data = pdn.bv_val - 1;
                ptr = pdn;
        }
@@ -131,8 +134,7 @@ bdb_dn2id_add(
 done:
        ch_free( buf );
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "db2id", LDAP_LEVEL_RESULTS, 
-               "<= bdb_dn2id_add: %d\n", rc ));
+       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
@@ -154,9 +156,8 @@ bdb_dn2id_delete(
        struct berval   pdn, ptr;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "db2id", LDAP_LEVEL_ARGS, 
-               "=> bdb_dn2id_delete ( \"%s\", 0x08lx )\n", 
-               e->e_ndn, e->e_id ));
+       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 );
@@ -177,9 +178,9 @@ bdb_dn2id_delete(
        rc = db->del( db, txn, &key, 0 );
        if( rc != 0 ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "db2id", LDAP_LEVEL_ERR, 
+               LDAP_LOG ( INDEX, ERR, 
                        "=> bdb_dn2id_delete: delete failed: %s %d\n", 
-                       db_strerror(rc), rc ));
+                       db_strerror(rc), rc, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "=> bdb_dn2id_delete: delete failed: %s %d\n",
                        db_strerror(rc), rc, 0 );
@@ -189,12 +190,12 @@ bdb_dn2id_delete(
 
        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 (( "db2id", LDAP_LEVEL_ERR, 
-                       "=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n", 
-                       ptr.bv_val, rc ));
+                       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",
@@ -206,6 +207,7 @@ bdb_dn2id_delete(
                dnParent( &ptr, &pdn );
 
                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;
@@ -214,9 +216,9 @@ bdb_dn2id_delete(
 
                if( rc != 0 ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG (( "db2id", LDAP_LEVEL_ERR, 
+                       LDAP_LOG ( INDEX, ERR, 
                                "=> bdb_dn2id_delete: parent (%s) delete failed: %d\n", 
-                               ptr.bv_val, rc ));
+                               ptr.bv_val, rc, 0 );
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "=> bdb_dn2id_delete: parent (%s) delete failed: %d\n",
@@ -232,9 +234,9 @@ bdb_dn2id_delete(
                rc = bdb_idl_delete_key( be, db, txn, &key, e->e_id );
                if( rc != 0 ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG (( "db2id", LDAP_LEVEL_ERR, 
+                       LDAP_LOG ( INDEX, ERR, 
                                "=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n", 
-                               ptr.bv_val, rc ));
+                               ptr.bv_val, rc, 0 );
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n",
@@ -245,6 +247,7 @@ bdb_dn2id_delete(
                dnParent( &ptr, &pdn );
 
                key.size = pdn.bv_len + 2;
+               key.ulen = key.size;
                key.data = pdn.bv_val - 1;
                ptr = pdn;
        }
@@ -252,7 +255,7 @@ bdb_dn2id_delete(
 done:
        ch_free( buf );
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "db2id", LDAP_LEVEL_RESULTS, "<= bdb_dn2id_delete %d\n", rc ));
+       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
@@ -264,7 +267,8 @@ bdb_dn2id(
        BackendDB       *be,
        DB_TXN *txn,
        struct berval   *dn,
-       ID *id )
+       ID *id,
+       int flags )
 {
        int             rc;
        DBT             key, data;
@@ -272,8 +276,7 @@ bdb_dn2id(
        DB *db = bdb->bi_dn2id->bdi_db;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "db2id", LDAP_LEVEL_ARGS, "=> bdb_dn2id( \"%s\" )\n", 
-       dn->bv_val ));
+       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
@@ -298,21 +301,20 @@ 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 (( "db2id", LDAP_LEVEL_ERR, 
-                       "<= bdb_dn2id: get failed %s (%d)\n", 
-                       db_strerror(rc), rc ));
+               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 (( "db2id", LDAP_LEVEL_RESULTS, 
-                       "<= bdb_dn2id: got id=0x%08lx\n", *id ));
+               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 );
@@ -329,7 +331,8 @@ bdb_dn2id_matched(
        DB_TXN *txn,
        struct berval   *in,
        ID *id,
-       ID *id2 )
+       ID *id2,
+       int flags )
 {
        int             rc;
        DBT             key, data;
@@ -340,8 +343,8 @@ bdb_dn2id_matched(
        ID              cached_id;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "db2id", LDAP_LEVEL_ARGS, 
-               "=> bdb_dn2id_matched( \"%s\" )\n", in->bv_val ));
+       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
@@ -377,7 +380,7 @@ 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 ) {
@@ -387,8 +390,8 @@ bdb_dn2id_matched(
                                dnParent( &dn, &pdn );
                        } else {
 #ifdef NEW_LOGGING
-                               LDAP_LOG (( "db2id", LDAP_LEVEL_DETAIL1, 
-                                       "<= bdb_dn2id_matched: no match\n" ));
+                               LDAP_LOG ( INDEX, DETAIL1, 
+                                       "<= bdb_dn2id_matched: no match\n", 0, 0, 0 );
 #else
                                Debug( LDAP_DEBUG_TRACE,
                                        "<= bdb_dn2id_matched: no match\n",
@@ -404,10 +407,10 @@ bdb_dn2id_matched(
                } else if ( rc == 0 ) {
                        if( data.size != sizeof( ID ) ) {
 #ifdef NEW_LOGGING
-                               LDAP_LOG (( "db2id", LDAP_LEVEL_DETAIL1, 
+                               LDAP_LOG ( INDEX, DETAIL1, 
                                        "<= bdb_dn2id_matched: get size mismatch:"
                                        "expected %ld, got %ld\n",
-                                       (long) sizeof(ID), (long) data.size ));
+                                       (long) sizeof(ID), (long) data.size, 0 );
 #else
                                Debug( LDAP_DEBUG_ANY,
                                        "<= bdb_dn2id_matched: get size mismatch: "
@@ -421,9 +424,9 @@ bdb_dn2id_matched(
                        }
 
 #ifdef NEW_LOGGING
-                       LDAP_LOG (( "db2id", LDAP_LEVEL_DETAIL1, 
+                       LDAP_LOG ( INDEX, DETAIL1, 
                                "<= bdb_dn2id_matched: id=0x%08lx: %s %s\n",
-                               (long) *id, *id2 == 0 ? "entry" : "matched", dn.bv_val ));
+                               (long) *id, *id2 == 0 ? "entry" : "matched", dn.bv_val );
 #else
                        Debug( LDAP_DEBUG_TRACE,
                                "<= bdb_dn2id_matched: id=0x%08lx: %s %s\n",
@@ -433,9 +436,9 @@ bdb_dn2id_matched(
 
                } else {
 #ifdef NEW_LOGGING
-                       LDAP_LOG (( "db2id", LDAP_LEVEL_ERR, 
+                       LDAP_LOG ( INDEX, ERR, 
                                "<= bdb_dn2id_matched: get failed: %s (%d)\n",
-                               db_strerror(rc), rc ));
+                               db_strerror(rc), rc, 0 );
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "<= bdb_dn2id_matched: get failed: %s (%d)\n",
@@ -453,7 +456,8 @@ int
 bdb_dn2id_children(
        BackendDB       *be,
        DB_TXN *txn,
-       struct berval *dn )
+       struct berval *dn, 
+       int flags )
 {
        int             rc;
        DBT             key, data;
@@ -462,8 +466,8 @@ bdb_dn2id_children(
        ID              id;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "db2id", LDAP_LEVEL_ARGS, 
-               "=> bdb_dn2id_children( %s )\n", dn->bv_val ));
+       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 );
@@ -483,14 +487,14 @@ 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 (( "db2id", LDAP_LEVEL_DETAIL1, 
+       LDAP_LOG ( INDEX, DETAIL1, 
                "<= bdb_dn2id_children( %s ): %schildren (%d)\n", 
                dn->bv_val, rc == 0 ? "" : ( rc == DB_NOTFOUND ? "no " :
-               db_strerror(rc)), rc ));
+               db_strerror(rc)), rc );
 #else
        Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_children( %s ): %schildren (%d)\n",
                dn->bv_val,
@@ -514,8 +518,8 @@ bdb_dn2idl(
        DB *db = bdb->bi_dn2id->bdi_db;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "db2id", LDAP_LEVEL_ARGS, 
-               "=> bdb_dn2ididl( \"%s\" )\n", dn->bv_val ));
+       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
@@ -528,6 +532,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 );
@@ -536,9 +542,8 @@ bdb_dn2idl(
 
        if( rc != 0 ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "db2id", LDAP_LEVEL_ERR, 
-                       "<= bdb_dn2ididl: get failed: %s (%d)\n", 
-                       db_strerror(rc), rc ));
+               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",
@@ -547,10 +552,10 @@ bdb_dn2idl(
 
        } else {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "db2id", LDAP_LEVEL_RESULTS, 
+               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 ) ));
+                       (long) BDB_IDL_LAST( ids ) );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "<= bdb_dn2idl: id=%ld first=%ld last=%ld\n",
@@ -736,7 +741,7 @@ int bdb_build_tree(
         * 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);
+       rdns = ldap_explode_dn(be->be_nsuffix[0].bv_val, 0);
        for (i=0; rdns[i]; i++);
        bdb->bi_nrdns = i;
        charray_free(rdns);
@@ -775,8 +780,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;
@@ -788,15 +793,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;
 }