Added LDAP_LOG messages to these files to match the existing Debug messages

diff --git a/servers/slapd/back-bdb/modify.c b/servers/slapd/back-bdb/modify.c
index bd82300d89fc5a8aced50b1b6ae836fbeeabf2bb..d3fde84883d9ce42989e7bfaad5f27228c80a9c2 100644 (file)
--- a/servers/slapd/back-bdb/modify.c
+++ b/servers/slapd/back-bdb/modify.c
@@ -31,8 +31,12 @@ int bdb_modify_internal(
        Attribute       *save_attrs;
        Attribute       *ap;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG (( "modify", LDAP_LEVEL_ENTRY,"bdb_modify_internal: 0x%08lx: %s\n", e->e_id, e->e_dn ));
+#else
        Debug( LDAP_DEBUG_TRACE, "bdb_modify_internal: 0x%08lx: %s\n",
                e->e_id, e->e_dn, 0);
+#endif
 
        if ( !acl_check_modlist( be, conn, op, e, modlist )) {
                return LDAP_INSUFFICIENT_ACCESS;
@@ -46,36 +50,64 @@ int bdb_modify_internal(
 
                switch ( mod->sm_op ) {
                case LDAP_MOD_ADD:
+#ifdef NEW_LOGGING
+                       LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify_internal: add\n" ));
+#else
                        Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: add\n", 0, 0, 0);
+#endif
                        err = modify_add_values( e, mod, text, textbuf, textlen );
                        if( err != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+                               LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: %d %s\n", err, *text ));
+#else
                                Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
                                        err, *text, 0);
+#endif
                        }
                        break;
 
                case LDAP_MOD_DELETE:
+#ifdef NEW_LOGGING
+                       LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify_internal: delete\n" ));
+#else
                        Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: delete\n", 0, 0, 0);
+#endif
                        err = modify_delete_values( e, mod, text, textbuf, textlen );
                        assert( err != LDAP_TYPE_OR_VALUE_EXISTS );
                        if( err != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+                               LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: %d %s\n", err, *text ));
+#else
                                Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
                                        err, *text, 0);
+#endif
                        }
                        break;
 
                case LDAP_MOD_REPLACE:
+#ifdef NEW_LOGGING
+                       LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify_internal: replace\n" ));
+#else
                        Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: replace\n", 0, 0, 0);
+#endif
                        err = modify_replace_values( e, mod, text, textbuf, textlen );
                        assert( err != LDAP_TYPE_OR_VALUE_EXISTS );
                        if( err != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+                               LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: %d %s\n", err, *text ));
+#else
                                Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
                                        err, *text, 0);
+#endif
                        }
                        break;
 
                case SLAP_MOD_SOFTADD:
+#ifdef NEW_LOGGING
+                       LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify_internal: softadd\n" ));
+#else
                        Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: softadd\n", 0, 0, 0);
+#endif
                        /* Avoid problems in index_add_mods()
                         * We need to add index if necessary.
                         */
@@ -87,18 +119,30 @@ int bdb_modify_internal(
                        }
 
                        if( err != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+                               LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: %d %s\n", err, *text ));
+#else
                                Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
                                        err, *text, 0);
+#endif
                        }
                        break;
 
                default:
+#ifdef NEW_LOGGING
+                               LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: invalid op %d\n", mod->sm_op ));
+#else
                        Debug(LDAP_DEBUG_ANY, "bdb_modify_internal: invalid op %d\n",
                                mod->sm_op, 0, 0);
+#endif
                        *text = "Invalid modify operation";
                        err = LDAP_OTHER;
+#ifdef NEW_LOGGING
+                               LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: %d %s\n", err, *text ));
+#else
                        Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
                                err, *text, 0);
+#endif
                }
 
                if ( err != LDAP_SUCCESS ) {
@@ -129,8 +173,12 @@ int bdb_modify_internal(
        if ( rc != LDAP_SUCCESS ) {
                attrs_free( e->e_attrs );
                e->e_attrs = save_attrs;
+#ifdef NEW_LOGGING
+                               LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: entry failed schema check %s\n", *text ));
+#else
                Debug( LDAP_DEBUG_ANY, "entry failed schema check: %s\n",
                        *text, 0, 0 );
+#endif
                return rc;
        }
 
@@ -144,9 +192,13 @@ int bdb_modify_internal(
                        if ( rc != LDAP_SUCCESS ) {
                                attrs_free( e->e_attrs );
                                e->e_attrs = save_attrs;
+#ifdef NEW_LOGGING
+                               LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: attribute index delete failure\n" ));
+#else
                                Debug( LDAP_DEBUG_ANY,
                                       "Attribute index delete failure",
                                       0, 0, 0 );
+#endif
                                return rc;
                        }
                        ap->a_flags &= ~SLAP_ATTR_IXDEL;
@@ -161,9 +213,13 @@ int bdb_modify_internal(
                        if ( rc != LDAP_SUCCESS ) {
                                attrs_free( e->e_attrs );
                                e->e_attrs = save_attrs;
+#ifdef NEW_LOGGING
+                               LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: attribute index add failure\n" ));
+#else
                                Debug( LDAP_DEBUG_ANY,
                                       "Attribute index add failure",
                                       0, 0, 0 );
+#endif
                                return rc;
                        }
                        ap->a_flags &= ~SLAP_ATTR_IXADD;
@@ -194,7 +250,11 @@ bdb_modify(
        DB_TXN  *ltid = NULL;
        struct bdb_op_info opinfo;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG (( "modify", LDAP_LEVEL_ENTRY, "bdb_modify: %s\n", dn->bv_val ));
+#else
        Debug( LDAP_DEBUG_ARGS, "bdb_modify: %s\n", dn->bv_val, 0, 0 );
+#endif
 
        if( 0 ) {
 retry: /* transaction retry */
@@ -202,8 +262,12 @@ retry:     /* transaction retry */
                        bdb_cache_delete_entry(&bdb->bi_cache, e);
                        bdb_cache_return_entry_w(&bdb->bi_cache, e);
                }
+#ifdef NEW_LOGGING
+               LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify: retrying...\n" ));
+#else
                Debug(LDAP_DEBUG_TRACE,
                        "bdb_modify: retrying...\n", 0, 0, 0);
+#endif
                rc = TXN_ABORT( ltid );
                ltid = NULL;
                op->o_private = NULL;
@@ -220,9 +284,13 @@ retry:     /* transaction retry */
                bdb->bi_db_opflags );
        text = NULL;
        if( rc != 0 ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify: txn_begin failed: %s (%d)\n", db_strerror(rc), rc ));
+#else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_modify: txn_begin failed: %s (%d)\n",
                        db_strerror(rc), rc, 0 );
+#endif
                rc = LDAP_OTHER;
                text = "internal error";
                goto return_results;
@@ -237,9 +305,13 @@ retry:     /* transaction retry */
        rc = bdb_dn2entry_w( be, ltid, ndn, &e, &matched, 0 );
 
        if ( rc != 0 ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify: dn2entry failed: (%d)\n", rc ));
+#else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_modify: dn2entry failed (%d)\n",
                        rc, 0, 0 );
+#endif
                switch( rc ) {
                case DB_LOCK_DEADLOCK:
                case DB_LOCK_NOTGRANTED:
@@ -285,9 +357,13 @@ retry:     /* transaction retry */
                BerVarray refs = get_entry_referrals( be,
                        conn, op, e );
 
+#ifdef NEW_LOGGING
+               LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify: entry is referral\n" ));
+#else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_modify: entry is referral\n",
                        0, 0, 0 );
+#endif
 
                send_ldap_result( conn, op, rc = LDAP_REFERRAL,
                        e->e_dn, NULL, refs, NULL );
@@ -301,9 +377,13 @@ retry:     /* transaction retry */
                &text, textbuf, textlen );
 
        if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify: modify failed (%d)\n", rc ));
+#else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_modify: modify failed (%d)\n",
                        rc, 0, 0 );
+#endif
                switch( rc ) {
                case DB_LOCK_DEADLOCK:
                case DB_LOCK_NOTGRANTED:
@@ -315,9 +395,13 @@ retry:     /* transaction retry */
        /* change the entry itself */
        rc = bdb_id2entry_update( be, ltid, e );
        if ( rc != 0 ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify: id2entry update failed (%d)\n", rc ));
+#else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_modify: id2entry update failed (%d)\n",
                        rc, 0, 0 );
+#endif
                switch( rc ) {
                case DB_LOCK_DEADLOCK:
                case DB_LOCK_NOTGRANTED:
@@ -336,18 +420,26 @@ retry:    /* transaction retry */
        op->o_private = NULL;
 
        if( rc != 0 ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify: txn_%s failed %s (%d)\n", op->o_noop ? "abort (no_op)" : "commit", db_strerror(rc), rc ));
+#else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_modify: txn_%s failed: %s (%d)\n",
                        op->o_noop ? "abort (no-op)" : "commit",
                        db_strerror(rc), rc );
+#endif
                rc = LDAP_OTHER;
                text = "commit failed";
 
        } else {
+#ifdef NEW_LOGGING
+               LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify: updated%s id=%08lx dn=\"%s\"\n", op->o_noop ? " (no_op)" : "", e->e_id, e->e_dn ));
+#else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_modify: updated%s id=%08lx dn=\"%s\"\n",
                        op->o_noop ? " (no-op)" : "",
                        e->e_id, e->e_dn );
+#endif
                rc = LDAP_SUCCESS;
                text = NULL;
        }

diff --git a/servers/slapd/back-bdb/modrdn.c b/servers/slapd/back-bdb/modrdn.c
index 4ff6577f9b053f5b70d57070c650f9581c6dd980..d0f9870709e8ca47f800fbc01446793a489b97ec 100644 (file)
--- a/servers/slapd/back-bdb/modrdn.c
+++ b/servers/slapd/back-bdb/modrdn.c
@@ -55,9 +55,15 @@ bdb_modrdn(
 
        int             manageDSAit = get_manageDSAit( op );
 
+#ifdef NEW_LOGGING
+       LDAP_LOG (( "modrdn", LDAP_LEVEL_ENTRY, "==>bdb_modrdn(%s,%s,%s)\n",
+               dn->bv_val,newrdn->bv_val,
+               newSuperior ? newSuperior->bv_val : "NULL" ));
+#else
        Debug( LDAP_DEBUG_TRACE, "==>bdb_modrdn(%s,%s,%s)\n",
                dn->bv_val, newrdn->bv_val,
                newSuperior ? newSuperior->bv_val : "NULL" );
+#endif
 
 #if 0
        if( newSuperior != NULL ) {
@@ -79,7 +85,11 @@ retry:       /* transaction retry */
                if (np != NULL) {
                        bdb_cache_return_entry_r(&bdb->bi_cache, np);
                }
+#ifdef NEW_LOGGING
+               LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "==>bdb_modrdn: retrying...\n"));
+#else
                Debug( LDAP_DEBUG_TRACE, "==>bdb_modrdn: retrying...\n", 0, 0, 0 );
+#endif
                rc = TXN_ABORT( ltid );
                ltid = NULL;
                op->o_private = NULL;
@@ -96,9 +106,13 @@ retry:      /* transaction retry */
                bdb->bi_db_opflags );
        text = NULL;
        if( rc != 0 ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "==>bdb_modrdn: txn_begin failed: %s (%d)\n", db_strerror(rc), rc ));
+#else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_delete: txn_begin failed: %s (%d)\n",
                        db_strerror(rc), rc, 0 );
+#endif
                rc = LDAP_OTHER;
                text = "internal error";
                goto return_results;
@@ -157,8 +171,12 @@ retry:     /* transaction retry */
                BerVarray refs = get_entry_referrals( be,
                        conn, op, e );
 
+#ifdef NEW_LOGGING
+               LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "==>bdb_modrdn: entry %s is referral \n", e->e_dn ));
+#else
                Debug( LDAP_DEBUG_TRACE, "bdb_modrdn: entry %s is referral\n",
                        e->e_dn, 0, 0 );
+#endif
 
                send_ldap_result( conn, op, rc = LDAP_REFERRAL,
                        e->e_dn, NULL, refs, NULL );
@@ -193,8 +211,12 @@ retry:     /* transaction retry */
                }
 
                if( p == NULL) {
+#ifdef NEW_LOGGING
+                       LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "==>bdb_modrdn: parent does not exist\n" ));
+#else
                        Debug( LDAP_DEBUG_TRACE, "bdb_modrdn: parent does not exist\n",
                                0, 0, 0);
+#endif
                        rc = LDAP_OTHER;
                        goto return_results;
                }
@@ -203,16 +225,24 @@ retry:    /* transaction retry */
                if ( ! access_allowed( be, conn, op, p,
                        children, NULL, ACL_WRITE, NULL ) )
                {
+#ifdef NEW_LOGGING
+                       LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "==>bdb_modrdn: no access to parent\n" ));
+#else
                        Debug( LDAP_DEBUG_TRACE, "no access to parent\n", 0,
                                0, 0 );
+#endif
                        send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
                                NULL, NULL, NULL, NULL );
                        goto return_results;
                }
 
+#ifdef NEW_LOGGING
+               LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "==>bdb_modrdn: wr to children %s is OK\n", p_ndn.bv_val ));
+#else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_modrdn: wr to children of entry %s OK\n",
                        p_ndn.bv_val, 0, 0 );
+#endif
                
                if ( p_ndn.bv_val == slap_empty_bv.bv_val ) {
                        p_dn = slap_empty_bv;
@@ -220,9 +250,13 @@ retry:     /* transaction retry */
                        dnParent( &e->e_name, &p_dn );
                }
 
+#ifdef NEW_LOGGING
+               LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "==>bdb_modrdn: parent dn=%s\n", p_dn.bv_val ));
+#else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_modrdn: parent dn=%s\n",
                        p_dn.bv_val, 0, 0 );
+#endif
 
        } else {
                /* no parent, modrdn entry directly under root */
@@ -241,31 +275,47 @@ retry:    /* transaction retry */
 
                                if ( ! rc )
                                {
+#ifdef NEW_LOGGING
+                                       LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "==>bdb_modrdn: no access to parent\n" ));
+#else
                                        Debug( LDAP_DEBUG_TRACE, 
                                                "no access to parent\n", 
                                                0, 0, 0 );
+#endif
                                        send_ldap_result( conn, op, 
                                                LDAP_INSUFFICIENT_ACCESS,
                                                NULL, NULL, NULL, NULL );
                                        goto return_results;
                                }
 
+#ifdef NEW_LOGGING
+                               LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "==>bdb_modrdn: wr to children of entry \"\" OK\n", p_dn.bv_val ));
+#else
                                Debug( LDAP_DEBUG_TRACE,
                                        "bdb_modrdn: wr to children of entry \"\" OK\n",
                                        0, 0, 0 );
+#endif
                
                                p_dn.bv_val = "";
                                p_dn.bv_len = 0;
 
+#ifdef NEW_LOGGING
+                               LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "==>bdb_modrdn: parent dn=\"\" \n" ));
+#else
                                Debug( LDAP_DEBUG_TRACE,
                                        "bdb_modrdn: parent dn=\"\"\n",
                                        0, 0, 0 );
+#endif
 
                        } else {
+#ifdef NEW_LOGGING
+                               LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "==>bdb_modrdn: no parent, not root &\"\" is not suffix\n" ));
+#else
                                Debug( LDAP_DEBUG_TRACE,
                                        "bdb_modrdn: no parent, not root "
                                        "& \"\" is not suffix\n",
                                        0, 0, 0);
+#endif
                                rc = LDAP_INSUFFICIENT_ACCESS;
                                goto return_results;
                        }
@@ -275,9 +325,13 @@ retry:     /* transaction retry */
        new_parent_dn = &p_dn;  /* New Parent unless newSuperior given */
 
        if ( newSuperior != NULL ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "==>bdb_modrdn: new parent \"%s\" requested...\n", newSuperior->bv_val ));
+#else
                Debug( LDAP_DEBUG_TRACE, 
                        "bdb_modrdn: new parent \"%s\" requested...\n",
                        newSuperior->bv_val, 0, 0 );
+#endif
 
                if ( newSuperior->bv_len ) {
                        np_dn = newSuperior;
@@ -303,22 +357,34 @@ retry:    /* transaction retry */
                        }
 
                        if( np == NULL) {
+#ifdef NEW_LOGGING
+                               LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "==>bdb_modrdn: newSup(ndn=%s) not here!\n", np_ndn->bv_val ));
+#else
                                Debug( LDAP_DEBUG_TRACE,
                                        "bdb_modrdn: newSup(ndn=%s) not here!\n",
                                        np_ndn->bv_val, 0, 0);
+#endif
                                rc = LDAP_OTHER;
                                goto return_results;
                        }
 
+#ifdef NEW_LOGGING
+                       LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "==>bdb_modrdn: wr to new parent OK np=%p, id=%ld\n", np, (long) np->e_id ));
+#else
                        Debug( LDAP_DEBUG_TRACE,
                                "bdb_modrdn: wr to new parent OK np=%p, id=%ld\n",
                                np, (long) np->e_id, 0 );
+#endif
 
                        /* check newSuperior for "children" acl */
                        if ( !access_allowed( be, conn, op, np, children, NULL, ACL_WRITE, NULL ) ) {
+#ifdef NEW_LOGGING
+                               LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "==>bdb_modrdn: no wr to newSup children\n" ));
+#else
                                Debug( LDAP_DEBUG_TRACE,
                                        "bdb_modrdn: no wr to newSup children\n",
                                        0, 0, 0 );
+#endif
                                rc = LDAP_INSUFFICIENT_ACCESS;
                                goto return_results;
                        }
@@ -326,8 +392,12 @@ retry:     /* transaction retry */
 #ifdef BDB_ALIASES
                        if ( is_entry_alias( np ) ) {
                                /* parent is an alias, don't allow add */
+#ifdef NEW_LOGGING
+                               LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "==>bdb_modrdn: entry is alias\n" ));
+#else
                                Debug( LDAP_DEBUG_TRACE, "bdb_modrdn: entry is alias\n",
                                        0, 0, 0 );
+#endif
 
                                rc = LDAP_ALIAS_PROBLEM;
                                goto return_results;
@@ -336,8 +406,12 @@ retry:     /* transaction retry */
 
                        if ( is_entry_referral( np ) ) {
                                /* parent is a referral, don't allow add */
+#ifdef NEW_LOGGING
+                               LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "==>bdb_modrdn: entry is referral\n" ));
+#else
                                Debug( LDAP_DEBUG_TRACE, "bdb_modrdn: entry is referral\n",
                                        0, 0, 0 );
+#endif
 
                                rc = LDAP_OPERATIONS_ERROR;
                                goto return_results;
@@ -364,37 +438,57 @@ retry:    /* transaction retry */
 
                                        if ( ! rc )
                                        {
+#ifdef NEW_LOGGING
+                                               LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "==>bdb_modrdn: no access to superior\n" ));
+#else
                                                Debug( LDAP_DEBUG_TRACE, 
                                                        "no access to new superior\n", 
                                                        0, 0, 0 );
+#endif
                                                send_ldap_result( conn, op, 
                                                        LDAP_INSUFFICIENT_ACCESS,
                                                        NULL, NULL, NULL, NULL );
                                                goto return_results;
                                        }
 
+#ifdef NEW_LOGGING
+                                       LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "bdb_modrdn: wr to children entry \"\" OK\n" ));
+#else
                                        Debug( LDAP_DEBUG_TRACE,
                                                "bdb_modrdn: wr to children of entry \"\" OK\n",
                                                0, 0, 0 );
+#endif
                
                                } else {
+#ifdef NEW_LOGGING
+                                       LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "bdb_modrdn: new superior=\"\", not root & \"\" is not suffix\n" ));
+#else
                                        Debug( LDAP_DEBUG_TRACE,
                                                "bdb_modrdn: new superior=\"\", not root "
                                                "& \"\" is not suffix\n",
                                                0, 0, 0);
+#endif
                                        rc = LDAP_INSUFFICIENT_ACCESS;
                                        goto return_results;
                                }
                        }
 
+#ifdef NEW_LOGGING
+                       LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "bdb_modrdn: new superior=\"\"\n" ));
+#else
                        Debug( LDAP_DEBUG_TRACE,
                                "bdb_modrdn: new superior=\"\"\n",
                                0, 0, 0 );
+#endif
                }
 
+#ifdef NEW_LOGGING
+               LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "bdb_modrdn: wr to new parent's children OK\n" ));
+#else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_modrdn: wr to new parent's children OK\n",
                        0, 0, 0 );
+#endif
 
                new_parent_dn = np_dn;
        }
@@ -404,8 +498,12 @@ retry:     /* transaction retry */
 
        dnNormalize2( NULL, &new_dn, &new_ndn );
 
+#ifdef NEW_LOGGING
+       LDAP_LOG (( "modrdn", LDAP_LEVEL_RESULTS, "bdb_modrdn: new ndn=%s\n", new_ndn.bv_val ));
+#else
        Debug( LDAP_DEBUG_TRACE, "bdb_modrdn: new ndn=%s\n",
                new_ndn.bv_val, 0, 0 );
+#endif
 
        rc = bdb_dn2id ( be, ltid, &new_ndn, &id );
        switch( rc ) {
@@ -423,9 +521,13 @@ retry:     /* transaction retry */
                goto return_results;
        }
 
+#ifdef NEW_LOGGING
+       LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "bdb_modrdn: new ndn=%s does not exist\n", new_ndn.bv_val ));
+#else
        Debug( LDAP_DEBUG_TRACE,
                "bdb_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
@@ -433,24 +535,36 @@ retry:    /* transaction retry */
        if ( ldap_bv2rdn( newrdn, &new_rdn, (char **)&text,
                LDAP_DN_FORMAT_LDAP ) )
        {
+#ifdef NEW_LOGGING
+               LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "bdb_modrdn: can't figure out type(s)/values(s) of newrdn\n" ));
+#else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_modrdn: can't figure out type(s)/values(s) "
                        "of newrdn\n", 0, 0, 0 );
+#endif
                rc = LDAP_OPERATIONS_ERROR;
                text = "unknown type(s) used in RDN";
                goto return_results;            
        }
 
+#ifdef NEW_LOGGING
+       LDAP_LOG (( "modrdn", LDAP_LEVEL_RESULTS, "bdb_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 ));
+#else
        Debug( LDAP_DEBUG_TRACE,
                "bdb_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 ( ldap_bv2rdn( dn, &old_rdn, (char **)&text,
                LDAP_DN_FORMAT_LDAP ) )
        {
+#ifdef NEW_LOGGING
+               LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "bdb_modrdn: can't figure out type(s)/values(s) of old_rdn\n" ));
+#else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_back_modrdn: can't figure out the old_rdn "
                        "type(s)/value(s)\n", 0, 0, 0 );
+#endif
                rc = LDAP_OTHER;
                text = "cannot parse RDN from old DN";
                goto return_results;            
@@ -461,10 +575,14 @@ retry:    /* transaction retry */
                && charray_strcasecmp( ( const char ** )old_rdn_types, 
                                ( const char ** )new_rdn_types ) != 0 ) {
                /* Not a big deal but we may say something */
+#ifdef NEW_LOGGING
+               LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "bdb_modrdn: old_rdn_type(s)=%s, new_rdn_type(s)=%s do not match\n", old_rdn_types[ 0 ], new_rdn_types[ 0 ] ));
+#else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_modrdn: old_rdn_type(s)=%s, new_rdn_type(s)=%s "
                        "do not match\n", 
                        old_rdn_types[ 0 ], new_rdn_types[ 0 ], 0 );
+#endif
        }               
 #endif
 
@@ -477,19 +595,27 @@ retry:    /* transaction retry */
                rc = slap_bv2ad( &new_rdn[0][ a_cnt ]->la_attr, &desc, &text );
 
                if ( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+                       LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "bdb_modrdn: %s: %s (new)\n", text, new_rdn[0][a_cnt]->la_attr.bv_val ));
+#else
                        Debug( LDAP_DEBUG_TRACE,
                                "bdb_modrdn: %s: %s (new)\n",
                                text, new_rdn[0][ a_cnt ]->la_attr.bv_val, 0 );
+#endif
                        goto return_results;            
                }
 
                /* ACL check of newly added attrs */
                if ( !access_allowed( be, conn, op, e, desc,
                        &new_rdn[0][ a_cnt ]->la_value, ACL_WRITE, NULL ) ) {
+#ifdef NEW_LOGGING
+                       LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "bdb_modrdn: access to attr \"%s\" (new) not allowed\n", new_rdn[0][a_cnt]->la_attr.bv_val ));
+#else
                        Debug( LDAP_DEBUG_TRACE,
                                "bdb_modrdn: access to attr \"%s\" "
                                "(new) not allowed\n", 
                                new_rdn[0][ a_cnt ]->la_attr.bv_val, 0, 0 );
+#endif
                        rc = LDAP_INSUFFICIENT_ACCESS;
                        goto return_results;
                }
@@ -510,9 +636,13 @@ retry:     /* transaction retry */
        if ( deleteoldrdn ) {
                /* Get value of old rdn */
                if ( old_rdn == NULL) {
+#ifdef NEW_LOGGING
+                       LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "bdb_modrdn: can't figure out old RDN values(s) from old RDN\n" ));
+#else
                        Debug( LDAP_DEBUG_TRACE,
                                "bdb_modrdn: can't figure out old RDN value(s) "
                                "from old RDN\n", 0, 0, 0 );
+#endif
                        rc = LDAP_OTHER;
                        text = "could not parse value(s) from old RDN";
                        goto return_results;            
@@ -527,19 +657,27 @@ retry:    /* transaction retry */
                                        &desc, &text );
 
                        if ( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+                               LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "bdb_modrdn: %s: %s (old)\n", text, old_rdn[0][d_cnt]->la_attr.bv_val ));
+#else
                                Debug( LDAP_DEBUG_TRACE,
                                        "bdb_modrdn: %s: %s (old)\n",
                                        text, old_rdn[0][ d_cnt ]->la_attr.bv_val, 0 );
+#endif
                                goto return_results;            
                        }
 
                        /* ACL check of newly added attrs */
                        if ( !access_allowed( be, conn, op, e, desc,
                                &old_rdn[0][d_cnt]->la_value, ACL_WRITE, NULL ) ) {
+#ifdef NEW_LOGGING
+                               LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "bdb_modrdn: access to attr \"%s\" (old) not allowed\n", old_rdn[0][d_cnt]->la_attr.bv_val ));
+#else
                                Debug( LDAP_DEBUG_TRACE,
                                        "bdb_modrdn: access to attr \"%s\" "
                                        "(old) not allowed\n", 
                                        old_rdn[0][ d_cnt ]->la_attr.bv_val, 0, 0 );
+#endif
                                rc = LDAP_INSUFFICIENT_ACCESS;
                                goto return_results;
                        }
@@ -659,15 +797,23 @@ retry:    /* transaction retry */
        op->o_private = NULL;
  
        if( rc == LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG (( "modrdn", LDAP_LEVEL_RESULTS, "bdb_modrdn: rdn modified%s id=%08lx dn=\"%s\"\n", op->o_noop ? " (no-op)" : "", e->e_id, e->e_dn ));
+#else
                Debug(LDAP_DEBUG_TRACE,
                        "bdb_modrdn: rdn modified%s id=%08lx dn=\"%s\"\n",
-                       op->o_noop ? " (no-op)" : "", e->e_id, e->e_dn );
+                       op->o_noop ? " (no-op)" : "", e->e_id, e->e_dn )
+#endif
                text = NULL;
                bdb_cache_entry_commit( e );
 
        } else {
+#ifdef NEW_LOGGING
+               LDAP_LOG (( "modrdn", LDAP_LEVEL_RESULTS, "bdb_modrdn: %s : %s (%d)\n", text, db_strerror(rc), rc ));
+#else
                Debug( LDAP_DEBUG_TRACE, "bdb_add: %s : %s (%d)\n",
                        text, db_strerror(rc), rc );
+#endif
                rc = LDAP_OTHER;
        }