Import ITS#3267 fix from HEAD

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

diff --git a/servers/slapd/back-bdb/tools.c b/servers/slapd/back-bdb/tools.c
index 226866431c33e1012c903aa968d3bcf77b7963d0..b4a83aa4e6e68463a6f89fca8ccc3e9bf548b616 100644 (file)
--- a/servers/slapd/back-bdb/tools.c
+++ b/servers/slapd/back-bdb/tools.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2000-2004 The OpenLDAP Foundation.
+ * Copyright 2000-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -138,13 +138,9 @@ ID bdb_tool_dn2id_get(
        rc = db->get( db, NULL, &key, &data, bdb->bi_db_opflags );
 
     if( rc != 0 ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG ( INDEX, ERR, "bdb_tool_dn2id_get: get failed %s (%d)\n",
-                               db_strerror(rc), rc, 0 );
-#else
-               Debug( LDAP_DEBUG_TRACE, "bdb_tool_dn2id_get: get failed: %s (%d)\n",
+               Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_tool_dn2id_get)
+                               ": get failed: %s (%d)\n",
                                db_strerror( rc ), rc, 0 );
-#endif
                id = NOID;
        }
 
@@ -204,37 +200,45 @@ static int bdb_tool_next_id(
        int hole )
 {
        struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
-       struct berval dn = e->e_nname;
-       struct berval pdn;
-       EntryInfo *ei = NULL;
+       struct berval dn = e->e_name;
+       struct berval ndn = e->e_nname;
+       struct berval pdn, npdn;
+       EntryInfo *ei = NULL, eidummy;
        int rc;
 
-       rc = bdb_cache_find_ndn( op, tid, &dn, &ei );
+       if (ndn.bv_len == 0) return 0;
+
+       rc = bdb_cache_find_ndn( op, tid, &ndn, &ei );
        if ( ei ) bdb_cache_entryinfo_unlock( ei );
        if ( rc == DB_NOTFOUND ) {
-               if ( be_issuffix( op->o_bd, &dn ) ) {
-                       pdn = slap_empty_bv;
-               } else {
+               if ( !be_issuffix( op->o_bd, &ndn ) ) {
+                       ID eid = e->e_id;
                        dnParent( &dn, &pdn );
-                       e->e_nname = pdn;
+                       dnParent( &ndn, &npdn );
+                       e->e_name = pdn;
+                       e->e_nname = npdn;
                        rc = bdb_tool_next_id( op, tid, e, text, 1 );
-                       e->e_nname = dn;
+                       e->e_name = dn;
+                       e->e_nname = ndn;
                        if ( rc ) {
                                return rc;
                        }
+                       /* If parent didn't exist, it was created just now
+                        * and its ID is now in e->e_id. Make sure the current
+                        * entry gets added under the new parent ID.
+                        */
+                       if ( eid != e->e_id ) {
+                               eidummy.bei_id = e->e_id;
+                               ei = &eidummy;
+                       }
                }
                rc = bdb_next_id( op->o_bd, tid, &e->e_id );
                if ( rc ) {
                        snprintf( text->bv_val, text->bv_len,
                                "next_id failed: %s (%d)",
                                db_strerror(rc), rc );
-#ifdef NEW_LOGGING
-               LDAP_LOG ( TOOLS, ERR, 
-                       "=> bdb_tool_next_id: %s\n", text->bv_val, 0, 0 );
-#else
                Debug( LDAP_DEBUG_ANY,
                        "=> bdb_tool_next_id: %s\n", text->bv_val, 0, 0 );
-#endif
                        return rc;
                }
                rc = bdb_dn2id_add( op, tid, ei, e );
@@ -242,13 +246,8 @@ static int bdb_tool_next_id(
                        snprintf( text->bv_val, text->bv_len, 
                                "dn2id_add failed: %s (%d)",
                                db_strerror(rc), rc );
-#ifdef NEW_LOGGING
-               LDAP_LOG ( TOOLS, ERR, 
-                       "=> bdb_tool_next_id: %s\n", text->bv_val, 0, 0 );
-#else
                Debug( LDAP_DEBUG_ANY,
                        "=> bdb_tool_next_id: %s\n", text->bv_val, 0, 0 );
-#endif
                } else if ( hole ) {
                        if ( nholes == nhmax - 1 ) {
                                if ( holes == hbuf ) {
@@ -259,7 +258,7 @@ static int bdb_tool_next_id(
                                }
                                nhmax *= 2;
                        }
-                       ber_dupbv( &holes[nholes].dn, &dn );
+                       ber_dupbv( &holes[nholes].dn, &ndn );
                        holes[nholes++].id = e->e_id;
                }
        } else if ( !hole ) {
@@ -300,13 +299,8 @@ ID bdb_tool_entry_put(
        assert( text->bv_val );
        assert( text->bv_val[0] == '\0' );      /* overconservative? */
 
-#ifdef NEW_LOGGING
-       LDAP_LOG ( TOOLS, ARGS, "=> bdb_tool_entry_put( %ld, \"%s\" )\n",
-               (long) e->e_id, e->e_dn, 0 );
-#else
-       Debug( LDAP_DEBUG_TRACE, "=> bdb_tool_entry_put( %ld, \"%s\" )\n",
-               (long) e->e_id, e->e_dn, 0 );
-#endif
+       Debug( LDAP_DEBUG_TRACE, "=> " LDAP_XSTRING(bdb_tool_entry_put)
+               "( %ld, \"%s\" )\n", (long) e->e_id, e->e_dn, 0 );
 
        rc = TXN_BEGIN( bdb->bi_dbenv, NULL, &tid, 
                bdb->bi_db_opflags );
@@ -314,13 +308,9 @@ ID bdb_tool_entry_put(
                snprintf( text->bv_val, text->bv_len,
                        "txn_begin failed: %s (%d)",
                        db_strerror(rc), rc );
-#ifdef NEW_LOGGING
-       LDAP_LOG ( TOOLS, ERR, "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
-#else
                Debug( LDAP_DEBUG_ANY,
-                       "=> bdb_tool_entry_put: %s\n",
+                       "=> " LDAP_XSTRING(bdb_tool_entry_put) ": %s\n",
                         text->bv_val, 0, 0 );
-#endif
                return NOID;
        }
 
@@ -340,13 +330,9 @@ ID bdb_tool_entry_put(
                snprintf( text->bv_val, text->bv_len,
                                "id2entry_add failed: %s (%d)",
                                db_strerror(rc), rc );
-#ifdef NEW_LOGGING
-               LDAP_LOG ( TOOLS, ERR, 
-                       "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
-#else
                Debug( LDAP_DEBUG_ANY,
-                       "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
-#endif
+                       "=> " LDAP_XSTRING(bdb_tool_entry_put) ": %s\n",
+                       text->bv_val, 0, 0 );
                goto done;
        }
 
@@ -355,13 +341,9 @@ ID bdb_tool_entry_put(
                snprintf( text->bv_val, text->bv_len,
                                "index_entry_add failed: %s (%d)",
                                db_strerror(rc), rc );
-#ifdef NEW_LOGGING
-               LDAP_LOG ( TOOLS, ERR, 
-                       "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
-#else
                Debug( LDAP_DEBUG_ANY,
-                       "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
-#endif
+                       "=> " LDAP_XSTRING(bdb_tool_entry_put) ": %s\n",
+                       text->bv_val, 0, 0 );
                goto done;
        }
 
@@ -372,14 +354,9 @@ done:
                        snprintf( text->bv_val, text->bv_len,
                                        "txn_commit failed: %s (%d)",
                                        db_strerror(rc), rc );
-#ifdef NEW_LOGGING
-                       LDAP_LOG ( TOOLS, ERR, 
-                               "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
-#else
                        Debug( LDAP_DEBUG_ANY,
-                               "=> bdb_tool_entry_put: %s\n",
+                               "=> " LDAP_XSTRING(bdb_tool_entry_put) ": %s\n",
                                text->bv_val, 0, 0 );
-#endif
                        e->e_id = NOID;
                }
 
@@ -388,14 +365,9 @@ done:
                snprintf( text->bv_val, text->bv_len,
                        "txn_aborted! %s (%d)",
                        db_strerror(rc), rc );
-#ifdef NEW_LOGGING
-               LDAP_LOG ( TOOLS, ERR, 
-                       "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
-#else
                Debug( LDAP_DEBUG_ANY,
-                       "=> bdb_tool_entry_put: %s\n",
+                       "=> " LDAP_XSTRING(bdb_tool_entry_put) ": %s\n",
                        text->bv_val, 0, 0 );
-#endif
                e->e_id = NOID;
        }
 
@@ -412,40 +384,26 @@ int bdb_tool_entry_reindex(
        DB_TXN *tid = NULL;
        Operation op = {0};
 
-#ifdef NEW_LOGGING
-       LDAP_LOG ( TOOLS, ARGS, 
-               "=> bdb_tool_entry_reindex( %ld )\n", (long) id, 0, 0 );
-#else
-       Debug( LDAP_DEBUG_ARGS, "=> bdb_tool_entry_reindex( %ld )\n",
+       Debug( LDAP_DEBUG_ARGS,
+               "=> " LDAP_XSTRING(bdb_tool_entry_reindex) "( %ld )\n",
                (long) id, 0, 0 );
-#endif
 
        e = bdb_tool_entry_get( be, id );
 
        if( e == NULL ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG ( TOOLS, DETAIL1, 
-                       "bdb_tool_entry_reindex:: could not locate id=%ld\n", 
-                       (long) id, 0, 0 );
-#else
                Debug( LDAP_DEBUG_ANY,
-                       "bdb_tool_entry_reindex:: could not locate id=%ld\n",
+                       LDAP_XSTRING(bdb_tool_entry_reindex)
+                       ": could not locate id=%ld\n",
                        (long) id, 0, 0 );
-#endif
                return -1;
        }
 
        rc = TXN_BEGIN( bi->bi_dbenv, NULL, &tid, bi->bi_db_opflags );
        if( rc != 0 ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG ( TOOLS, ERR, 
-                       "=> bdb_tool_entry_reindex: txn_begin failed: %s (%d)\n", 
-                       db_strerror(rc), rc, 0 );
-#else
                Debug( LDAP_DEBUG_ANY,
-                       "=> bdb_tool_entry_reindex: txn_begin failed: %s (%d)\n",
+                       "=> " LDAP_XSTRING(bdb_tool_entry_reindex) ": "
+                       "txn_begin failed: %s (%d)\n",
                        db_strerror(rc), rc, 0 );
-#endif
                goto done;
        }
        
@@ -456,13 +414,9 @@ int bdb_tool_entry_reindex(
         *
         */
 
-#ifdef NEW_LOGGING
-       LDAP_LOG ( TOOLS, ERR, 
-               "=> bdb_tool_entry_reindex( %ld, \"%s\" )\n", (long) id, e->e_dn, 0 );
-#else
-       Debug( LDAP_DEBUG_TRACE, "=> bdb_tool_entry_reindex( %ld, \"%s\" )\n",
+       Debug( LDAP_DEBUG_TRACE,
+               "=> " LDAP_XSTRING(bdb_tool_entry_reindex) "( %ld, \"%s\" )\n",
                (long) id, e->e_dn, 0 );
-#endif
 
        op.o_bd = be;
        op.o_tmpmemctx = NULL;
@@ -472,15 +426,10 @@ int bdb_tool_entry_reindex(
        /* add dn2id indices */
        rc = bdb_dn2id_add( &op, tid, NULL, e );
        if( rc != 0 && rc != DB_KEYEXIST ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG ( TOOLS, ERR, 
-                       "=> bdb_tool_entry_reindex: dn2id_add failed: %s (%d)\n", 
-                       db_strerror(rc), rc, 0 );
-#else
                Debug( LDAP_DEBUG_ANY,
-                       "=> bdb_tool_entry_reindex: dn2id_add failed: %s (%d)\n",
+                       "=> " LDAP_XSTRING(bdb_tool_entry_reindex)
+                       ": dn2id_add failed: %s (%d)\n",
                        db_strerror(rc), rc, 0 );
-#endif
                goto done;
        }
 #endif
@@ -491,29 +440,19 @@ done:
        if( rc == 0 ) {
                rc = TXN_COMMIT( tid, 0 );
                if( rc != 0 ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG ( TOOLS, ERR, 
-                               "=> bdb_tool_entry_reindex: txn_commit failed: %s (%d)\n", 
-                               db_strerror(rc), rc, 0 );
-#else
                        Debug( LDAP_DEBUG_ANY,
-                               "=> bdb_tool_entry_reindex: txn_commit failed: %s (%d)\n",
+                               "=> " LDAP_XSTRING(bdb_tool_entry_reindex)
+                               ": txn_commit failed: %s (%d)\n",
                                db_strerror(rc), rc, 0 );
-#endif
                        e->e_id = NOID;
                }
 
        } else {
                TXN_ABORT( tid );
-#ifdef NEW_LOGGING
-               LDAP_LOG ( TOOLS, DETAIL1, 
-                       "=> bdb_tool_entry_reindex: txn_aborted! %s (%d)\n", 
-                       db_strerror(rc), rc, 0 );
-#else
                Debug( LDAP_DEBUG_ANY,
-                       "=> bdb_tool_entry_reindex: txn_aborted! %s (%d)\n",
+                       "=> " LDAP_XSTRING(bdb_tool_entry_reindex)
+                       ": txn_aborted! %s (%d)\n",
                        db_strerror(rc), rc, 0 );
-#endif
                e->e_id = NOID;
        }
        bdb_entry_release( &op, e, 0 );
@@ -541,13 +480,9 @@ ID bdb_tool_entry_modify(
        assert ( e->e_id != NOID );
        assert ( e->e_id != 0 );
 
-#ifdef NEW_LOGGING
-       LDAP_LOG ( TOOLS, ARGS, "=> bdb_tool_entry_put( %ld, \"%s\" )\n",
-               (long) e->e_id, e->e_dn, 0 );
-#else
-       Debug( LDAP_DEBUG_TRACE, "=> bdb_tool_entry_put( %ld, \"%s\" )\n",
+       Debug( LDAP_DEBUG_TRACE,
+               "=> " LDAP_XSTRING(bdb_tool_entry_modify) "( %ld, \"%s\" )\n",
                (long) e->e_id, e->e_dn, 0 );
-#endif
 
        rc = TXN_BEGIN( bdb->bi_dbenv, NULL, &tid, 
                bdb->bi_db_opflags );
@@ -555,13 +490,9 @@ ID bdb_tool_entry_modify(
                snprintf( text->bv_val, text->bv_len,
                        "txn_begin failed: %s (%d)",
                        db_strerror(rc), rc );
-#ifdef NEW_LOGGING
-       LDAP_LOG ( TOOLS, ERR, "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
-#else
                Debug( LDAP_DEBUG_ANY,
-                       "=> bdb_tool_entry_put: %s\n",
+                       "=> " LDAP_XSTRING(bdb_tool_entry_modify) ": %s\n",
                         text->bv_val, 0, 0 );
-#endif
                return NOID;
        }
 
@@ -575,13 +506,9 @@ ID bdb_tool_entry_modify(
                snprintf( text->bv_val, text->bv_len,
                                "id2entry_add failed: %s (%d)",
                                db_strerror(rc), rc );
-#ifdef NEW_LOGGING
-               LDAP_LOG ( TOOLS, ERR, 
-                       "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
-#else
                Debug( LDAP_DEBUG_ANY,
-                       "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
-#endif
+                       "=> " LDAP_XSTRING(bdb_tool_entry_modify) ": %s\n",
+                       text->bv_val, 0, 0 );
                goto done;
        }
 
@@ -590,13 +517,9 @@ ID bdb_tool_entry_modify(
                snprintf( text->bv_val, text->bv_len,
                                "index_entry_del failed: %s (%d)",
                                db_strerror(rc), rc );
-#ifdef NEW_LOGGING
-               LDAP_LOG ( TOOLS, ERR, 
-                       "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
-#else
                Debug( LDAP_DEBUG_ANY,
-                       "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
-#endif
+                       "=> " LDAP_XSTRING(bdb_tool_entry_modify) ": %s\n",
+                       text->bv_val, 0, 0 );
                goto done;
        }
 
@@ -605,13 +528,9 @@ ID bdb_tool_entry_modify(
                snprintf( text->bv_val, text->bv_len,
                                "index_entry_add failed: %s (%d)",
                                db_strerror(rc), rc );
-#ifdef NEW_LOGGING
-               LDAP_LOG ( TOOLS, ERR, 
-                       "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
-#else
                Debug( LDAP_DEBUG_ANY,
-                       "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
-#endif
+                       "=> " LDAP_XSTRING(bdb_tool_entry_modify) ": %s\n",
+                       text->bv_val, 0, 0 );
                goto done;
        }
 
@@ -622,14 +541,9 @@ done:
                        snprintf( text->bv_val, text->bv_len,
                                        "txn_commit failed: %s (%d)",
                                        db_strerror(rc), rc );
-#ifdef NEW_LOGGING
-                       LDAP_LOG ( TOOLS, ERR, 
-                               "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
-#else
                        Debug( LDAP_DEBUG_ANY,
-                               "=> bdb_tool_entry_put: %s\n",
-                               text->bv_val, 0, 0 );
-#endif
+                               "=> " LDAP_XSTRING(bdb_tool_entry_modify) ": "
+                               "%s\n", text->bv_val, 0, 0 );
                        e->e_id = NOID;
                }
 
@@ -638,14 +552,9 @@ done:
                snprintf( text->bv_val, text->bv_len,
                        "txn_aborted! %s (%d)",
                        db_strerror(rc), rc );
-#ifdef NEW_LOGGING
-               LDAP_LOG ( TOOLS, ERR, 
-                       "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
-#else
                Debug( LDAP_DEBUG_ANY,
-                       "=> bdb_tool_entry_put: %s\n",
+                       "=> " LDAP_XSTRING(bdb_tool_entry_modify) ": %s\n",
                        text->bv_val, 0, 0 );
-#endif
                e->e_id = NOID;
        }