Added LDAP_LOG messages to operational.c and fixed compile error in dn2id.c

diff --git a/servers/slapd/back-bdb/dn2id.c b/servers/slapd/back-bdb/dn2id.c
index added21c57266d5c5b9e1d7341f26b68ea57a5c9..6511e6706bbb08cf17a29c3d3f294c65d5ba2614 100644 (file)
--- a/servers/slapd/back-bdb/dn2id.c
+++ b/servers/slapd/back-bdb/dn2id.c
@@ -254,7 +254,7 @@ done:
 #ifdef NEW_LOGGING
        LDAP_LOG (( "db2id", LDAP_LEVEL_RESULTS, "<= bdb_dn2id_delete %d\n", rc ));
 #else
-       Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_delete %d\n", rc, 0, 0 )
+       Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_delete %d\n", rc, 0, 0 );
 #endif
        return rc;
 }

diff --git a/servers/slapd/back-bdb/operational.c b/servers/slapd/back-bdb/operational.c
index 278173fa2fdef92b04fd67e3859daf89a7c89578..08172b8c2d173278de42aa9669ca1114285caf58 100644 (file)
--- a/servers/slapd/back-bdb/operational.c
+++ b/servers/slapd/back-bdb/operational.c
@@ -47,8 +47,13 @@ retry:       /* transaction retry */
                if( e != NULL ) {
                        bdb_cache_return_entry_w(&bdb->bi_cache, e);
                }
-               Debug( LDAP_DEBUG_TRACE, "==> bdb_delete: retrying...\n", 
+#ifdef NEW_LOGGING
+               LDAP_LOG (( "operational", LDAP_LEVEL_DETAIL1,
+                       "=> bdb_operational: retrying...\n" ));
+#else
+               Debug( LDAP_DEBUG_TRACE, "==> bdb_operational: retrying...\n", 
                                0, 0, 0 );
+#endif
                rc = TXN_ABORT( ltid );
                ltid = NULL;
                op->o_private = NULL;
@@ -62,9 +67,15 @@ retry:       /* transaction retry */
        /* begin transaction */
        rc = TXN_BEGIN( bdb->bi_dbenv, NULL, &ltid, bdb->bi_db_opflags );
        if ( rc != 0 ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG (( "operational", LDAP_LEVEL_ERR,
+                       "=> bdb_operational: txn_begin failed: %s (%d)\n",
+                        db_strerror(rc), rc ));
+#else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_operational: txn_begin failed: %s (%d)\n",
                        db_strerror( rc ), rc, 0 );
+#endif
                rc = LDAP_OTHER;
                return rc;
        }
@@ -90,9 +101,15 @@ retry:      /* transaction retry */
                break;
 
        default:
+#ifdef NEW_LOGGING
+               LDAP_LOG (( "operational", LDAP_LEVEL_ERR,
+                       "=> bdb_operational: has_children failed: %s (%d)\n",
+                        db_strerror(rc), rc ));
+#else
                Debug(LDAP_DEBUG_ARGS, 
                        "<=- bdb_operational: has_children failed: %s (%d)\n", 
                        db_strerror(rc), rc, 0 );
+#endif
                rc = LDAP_OTHER;
        }