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

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

diff --git a/servers/slapd/back-bdb/operational.c b/servers/slapd/back-bdb/operational.c
index 278173fa2fdef92b04fd67e3859daf89a7c89578..cfcf17cdb3d02ec46f62cdd2c1354923b7ffca93 100644 (file)
--- a/servers/slapd/back-bdb/operational.c
+++ b/servers/slapd/back-bdb/operational.c
@@ -33,7 +33,7 @@ bdb_operational(
        Attribute       **aa = a;
        int             rc;
        DB_TXN          *ltid = NULL;
-        struct bdb_op_info opinfo;
+    struct bdb_op_info opinfo;
        
        assert( e );
 
@@ -44,11 +44,18 @@ bdb_operational(
 
        if( 0 ) {
 retry: /* transaction retry */
+#if 0
                if( e != NULL ) {
-                       bdb_cache_return_entry_w(&bdb->bi_cache, e);
+                       bdb_unlocked_cache_return_entry_w(&bdb->bi_cache, e);
                }
-               Debug( LDAP_DEBUG_TRACE, "==> bdb_delete: retrying...\n", 
+#endif
+#ifdef NEW_LOGGING
+               LDAP_LOG ( OPERATION, DETAIL1, 
+                       "=> bdb_operational: retrying...\n", 0, 0, 0 );
+#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 +69,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 ( OPERATION, ERR, 
+                       "=> bdb_operational: txn_begin failed: %s (%d)\n",
+                       db_strerror(rc), rc, 0 );
+#else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_operational: txn_begin failed: %s (%d)\n",
                        db_strerror( rc ), rc, 0 );
+#endif
                rc = LDAP_OTHER;
                return rc;
        }
@@ -74,7 +87,7 @@ retry:        /* transaction retry */
        opinfo.boi_err = 0;
        op->o_private = &opinfo;
 
-       rc = bdb_dn2id_children( be, ltid, &e->e_nname );
+       rc = bdb_dn2id_children( be, ltid, &e->e_nname, 0 );
        
        switch( rc ) {
        case DB_LOCK_DEADLOCK:
@@ -90,9 +103,15 @@ retry:      /* transaction retry */
                break;
 
        default:
+#ifdef NEW_LOGGING
+               LDAP_LOG ( OPERATION, ERR, 
+                       "=> bdb_operational: has_children failed: %s (%d)\n",
+                       db_strerror(rc), rc, 0 );
+#else
                Debug(LDAP_DEBUG_ARGS, 
                        "<=- bdb_operational: has_children failed: %s (%d)\n", 
                        db_strerror(rc), rc, 0 );
+#endif
                rc = LDAP_OTHER;
        }