]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-bdb/filterindex.c
projects / openldap / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add debug if bdb_cache_entry_db_lock fails to get a lock
[openldap] / servers / slapd / back-bdb / filterindex.c
diff --git a/servers/slapd/back-bdb/filterindex.c b/servers/slapd/back-bdb/filterindex.c
index 8387a702ba3a3ff7d71776a503b54ee15ea019fa..53289e7ffaf3ddf3356d583456b8853e933a1d68 100644 (file)
--- a/servers/slapd/back-bdb/filterindex.c
+++ b/servers/slapd/back-bdb/filterindex.c
@@ -39,18 +39,20 @@ static int list_candidates(
        Filter *flist,
        int ftype,
        ID *ids,
-       ID *tmp );
+       ID *tmp,
+       ID *stack );
 
 int
 bdb_filter_candidates(
        Backend *be,
        Filter  *f,
        ID *ids,
-       ID *tmp )
+       ID *tmp,
+       ID *stack )
 {
        int rc = -1;
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "filterindex", LDAP_LEVEL_ENTRY, "=> bdb_filter_candidates\n"));
+       LDAP_LOG ( INDEX, ENTRY, "=> bdb_filter_candidates\n", 0, 0, 0 );
 #else
        Debug( LDAP_DEBUG_FILTER, "=> bdb_filter_candidates\n", 0, 0, 0 );
 #endif
@@ -58,16 +60,20 @@ bdb_filter_candidates(
        switch ( f->f_choice ) {
        case SLAPD_FILTER_DN_ONE:
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tDN ONE\n"));
+               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tDN ONE\n", 0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "\tDN ONE\n", 0, 0, 0 );
 #endif
                rc = bdb_dn2idl( be, f->f_dn, DN_ONE_PREFIX, ids );
+               if( rc == DB_NOTFOUND ) {
+                       BDB_IDL_ZERO( ids );
+                       rc = 0;
+               }
                break;
 
        case SLAPD_FILTER_DN_SUBTREE:
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tDN SUBTREE\n"));
+               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tDN SUBTREE\n", 0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "\tDN SUBTREE\n", 0, 0, 0 );
 #endif
@@ -76,7 +82,7 @@ bdb_filter_candidates(
 
        case LDAP_FILTER_PRESENT:
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tPRESENT\n"));
+               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tPRESENT\n", 0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "\tPRESENT\n", 0, 0, 0 );
 #endif
@@ -85,7 +91,7 @@ bdb_filter_candidates(
 
        case LDAP_FILTER_EQUALITY:
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tEQUALITY\n"));
+               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tEQUALITY\n", 0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "\tEQUALITY\n", 0, 0, 0 );
 #endif
@@ -94,7 +100,7 @@ bdb_filter_candidates(
 
        case LDAP_FILTER_APPROX:
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tAPPROX\n"));
+               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tAPPROX\n", 0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "\tAPPROX\n", 0, 0, 0 );
 #endif
@@ -103,7 +109,7 @@ bdb_filter_candidates(
 
        case LDAP_FILTER_SUBSTRINGS:
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tSUBSTRINGS\n"));
+               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tSUBSTRINGS\n", 0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "\tSUBSTRINGS\n", 0, 0, 0 );
 #endif
@@ -113,7 +119,7 @@ bdb_filter_candidates(
        case LDAP_FILTER_GE:
                /* no GE index, use pres */
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tGE\n"));
+               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tGE\n", 0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "\tGE\n", 0, 0, 0 );
 #endif
@@ -123,7 +129,7 @@ bdb_filter_candidates(
        case LDAP_FILTER_LE:
                /* no LE index, use pres */
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tLE\n"));
+               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tLE\n", 0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "\tLE\n", 0, 0, 0 );
 #endif
@@ -133,7 +139,7 @@ bdb_filter_candidates(
        case LDAP_FILTER_NOT:
                /* no indexing to support NOT filters */
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tNOT\n"));
+               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tNOT\n",0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "\tNOT\n", 0, 0, 0 );
 #endif
@@ -141,35 +147,37 @@ bdb_filter_candidates(
 
        case LDAP_FILTER_AND:
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tAND\n"));
+               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tAND\n", 0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "\tAND\n", 0, 0, 0 );
 #endif
                rc = list_candidates( be, 
-                       f->f_and, LDAP_FILTER_AND, ids, tmp );
+                       f->f_and, LDAP_FILTER_AND, ids, tmp, stack );
                break;
 
        case LDAP_FILTER_OR:
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tOR\n"));
+               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tOR\n", 0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "\tOR\n", 0, 0, 0 );
 #endif
                rc = list_candidates( be, 
-                       f->f_or, LDAP_FILTER_OR, ids, tmp );
+                       f->f_or, LDAP_FILTER_OR, ids, tmp, stack );
                break;
 
        default:
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tUNKNOWN\n"));
+               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tUNKNOWN\n", 0, 0, 0 );
 #else
-               Debug( LDAP_DEBUG_FILTER, "\tUNKNOWN %d\n",
-                       f->f_choice, 0, 0 );
+               Debug( LDAP_DEBUG_FILTER, "\tUNKNOWN %lu\n",
+                       (unsigned long) f->f_choice, 0, 0 );
 #endif
        }
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "=> bdb_filter_candidates: id=%ld first=%ld last=%ld\n", (long) ids[0], (long) BDB_IDL_FIRST( ids ), (long) BDB_IDL_LAST( ids ) ));
+       LDAP_LOG ( INDEX, RESULTS, 
+               "=> bdb_filter_candidates: id=%ld first=%ld last=%ld\n", 
+               (long)ids[0], (long)BDB_IDL_FIRST( ids ), (long) BDB_IDL_LAST( ids ));
 #else
        Debug( LDAP_DEBUG_FILTER,
                "<= bdb_filter_candidates: id=%ld first=%ld last=%ld\n",
@@ -187,22 +195,15 @@ list_candidates(
        Filter  *flist,
        int             ftype,
        ID *ids,
-       ID *tmp )
+       ID *tmp,
+       ID *save )
 {
        struct bdb_info *bdb = (struct bdb_info *) be->be_private;
        int rc = 0;
        Filter  *f;
 
-/* Systems that can't increase thread stack size will die with these
- * structures allocated on the stack. */
-#if !defined(LDAP_PVT_THREAD_STACK_SIZE) || (LDAP_PVT_THREAD_STACK_SIZE == 0)
-       ID *save = ch_malloc(BDB_IDL_UM_SIZEOF);
-#else
-       ID save[BDB_IDL_UM_SIZE];
-#endif
-
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_list_candidates: 0x%x\n", ftype));
+       LDAP_LOG ( INDEX, ARGS, "=> bdb_list_candidates: 0x%x\n", ftype, 0 , 0 );
 #else
        Debug( LDAP_DEBUG_FILTER, "=> bdb_list_candidates 0x%x\n", ftype, 0, 0 );
 #endif
@@ -215,7 +216,8 @@ list_candidates(
        }
 
        for ( f = flist; f != NULL; f = f->f_next ) {
-               rc = bdb_filter_candidates( be, f, save, tmp );
+               rc = bdb_filter_candidates( be, f, save, tmp,
+                       save+BDB_IDL_UM_SIZE );
 
                if ( rc != 0 ) {
                        if ( ftype == LDAP_FILTER_AND ) {
@@ -235,13 +237,12 @@ list_candidates(
                }
        }
 
-#if !defined(LDAP_PVT_THREAD_STACK_SIZE) || (LDAP_PVT_THREAD_STACK_SIZE == 0)
-       free(save);
-#endif
-
        if( rc ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_list_candidates: id=%ld first=%ld last=%ld\n", (long) ids[0], (long) BDB_IDL_FIRST( ids ), (long) BDB_IDL_LAST( ids ) ));
+               LDAP_LOG ( INDEX, RESULTS, 
+                       "<= bdb_list_candidates: id=%ld first=%ld last=%ld\n",
+                       (long) ids[0], (long) BDB_IDL_FIRST( ids ), 
+                       (long) BDB_IDL_LAST( ids ) );
 #else
                Debug( LDAP_DEBUG_FILTER,
                        "<= bdb_list_candidates: id=%ld first=%ld last=%ld\n",
@@ -252,7 +253,7 @@ list_candidates(
 
        } else {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "<= bdb_list_candidates: rc=%d\n", rc));
+               LDAP_LOG ( INDEX, ARGS, "<= bdb_list_candidates: rc=%d\n", rc, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER,
                        "<= bdb_list_candidates: undefined rc=%d\n",
@@ -276,7 +277,7 @@ presence_candidates(
        struct berval prefix = {0};
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "filterindex", LDAP_LEVEL_ENTRY, "=> bdb_presence_candidates\n"));
+       LDAP_LOG ( INDEX, ENTRY, "=> bdb_presence_candidates\n", 0, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "=> bdb_presence_candidates\n", 0, 0, 0 );
 #endif
@@ -291,7 +292,8 @@ presence_candidates(
 
        if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "=> bdb_presence_candidates: index_parm returned=%d\n", rc ));
+               LDAP_LOG ( INDEX, RESULTS, 
+                       "=> bdb_presence_candidates: index_parm returned=%d\n", rc, 0, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "<= bdb_presence_candidates: index_param returned=%d\n",
@@ -303,7 +305,8 @@ presence_candidates(
        if( db == NULL ) {
                /* not indexed */
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_presence_candidates: not indexed\n" ));
+               LDAP_LOG(INDEX, RESULTS, 
+                       "<= bdb_presence_candidates: not indexed\n", 0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "<= bdb_presence_candidates: not indexed\n",
@@ -314,7 +317,8 @@ presence_candidates(
 
        if( prefix.bv_val == NULL ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_presence_candidates: no prefix\n" ));
+               LDAP_LOG(INDEX, RESULTS, 
+                       "<= bdb_presence_candidates: no prefix\n", 0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "<= bdb_presence_candidates: no prefix\n",
@@ -330,7 +334,8 @@ presence_candidates(
                rc = 0;
        } else if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_presence_candidates: key read failed (%d)\n", rc ));
+               LDAP_LOG ( INDEX, RESULTS, 
+                       "<= bdb_presence_candidates: key read failed (%d)\n", rc, 0, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "<= bdb_presense_candidates: key read failed (%d)\n",
@@ -340,7 +345,9 @@ presence_candidates(
        }
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_presence_candidates: id=%ld first=%ld last=%ld\n", (long) ids[0], (long) BDB_IDL_FIRST( ids ), (long) BDB_IDL_LAST( ids ) ));
+       LDAP_LOG ( INDEX, RESULTS, 
+               "<= bdb_presence_candidates: id=%ld first=%ld last=%ld\n",
+               (long)ids[0], (long)BDB_IDL_FIRST( ids ), (long)BDB_IDL_LAST( ids ) );
 #else
        Debug(LDAP_DEBUG_TRACE,
                "<= bdb_presence_candidates: id=%ld first=%ld last=%ld\n",
@@ -369,7 +376,7 @@ equality_candidates(
        MatchingRule *mr;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "filterindex", LDAP_LEVEL_ENTRY, "=> equality_candidates\n"));
+       LDAP_LOG ( INDEX, ENTRY, "=> equality_candidates\n", 0, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "=> bdb_equality_candidates\n", 0, 0, 0 );
 #endif
@@ -379,7 +386,8 @@ equality_candidates(
 
        if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "=> bdb_equality_candidates: index_param failed (%d)\n", rc));
+               LDAP_LOG ( INDEX, RESULTS, 
+                       "=> bdb_equality_candidates: index_param failed (%d)\n", rc, 0, 0);
 #else
                Debug( LDAP_DEBUG_ANY,
                        "<= bdb_equality_candidates: index_param failed (%d)\n",
@@ -390,7 +398,8 @@ equality_candidates(
 
        if ( db == NULL ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "=> bdb_equality_candidates: not indexed\n"));
+               LDAP_LOG(INDEX, RESULTS, 
+                       "=> bdb_equality_candidates: not indexed\n", 0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "<= bdb_equality_candidates: not indexed\n", 0, 0, 0 );
@@ -418,7 +427,8 @@ equality_candidates(
 
        if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "=> bdb_equality_candidates: MR filter failed (%d)\n", rc));
+               LDAP_LOG ( INDEX, RESULTS, 
+                       "=> bdb_equality_candidates: MR filter failed (%d)\n", rc, 0, 0);
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "<= bdb_equality_candidates: MR filter failed (%d)\n",
@@ -429,7 +439,8 @@ equality_candidates(
 
        if( keys == NULL ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "=> bdb_equality_candidates: no keys\n"));
+               LDAP_LOG ( INDEX, RESULTS, 
+                       "=> bdb_equality_candidates: no keys\n", 0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "<= bdb_equality_candidates: no keys\n",
@@ -446,7 +457,8 @@ equality_candidates(
                        rc = 0;
                } else if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_equality_candidates: key read failed (%d)\n", rc));
+                       LDAP_LOG ( INDEX, RESULTS, 
+                               "<= bdb_equality_candidates: key read failed (%d)\n", rc, 0, 0);
 #else
                        Debug( LDAP_DEBUG_TRACE,
                                "<= bdb_equality_candidates key read failed (%d)\n",
@@ -457,7 +469,7 @@ equality_candidates(
 
                if( BDB_IDL_IS_ZERO( tmp ) ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "=> bdb_equality_candidates: NULL\n"));
+                       LDAP_LOG ( INDEX, RESULTS, "=> bdb_equality_candidates: NULL\n", 0, 0, 0);
 #else
                        Debug( LDAP_DEBUG_TRACE,
                                "<= bdb_equality_candidates NULL\n",
@@ -476,7 +488,10 @@ equality_candidates(
        ber_bvarray_free( keys );
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_equality_candidates: id=%ld first=%ld last=%ld\n", (long) ids[0], (long) BDB_IDL_FIRST( ids ), (long) BDB_IDL_LAST( ids ) ));
+       LDAP_LOG ( INDEX, RESULTS, 
+               "<= bdb_equality_candidates: id=%ld first=%ld last=%ld\n", 
+               (long) ids[0], (long) BDB_IDL_FIRST( ids ), 
+               (long) BDB_IDL_LAST( ids ) );
 #else
        Debug( LDAP_DEBUG_TRACE,
                "<= bdb_equality_candidates id=%ld, first=%ld, last=%ld\n",
@@ -504,7 +519,7 @@ approx_candidates(
        MatchingRule *mr;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "filterindex", LDAP_LEVEL_ENTRY, "=> bdb_approx_candidates\n"));
+       LDAP_LOG ( INDEX, ENTRY, "=> bdb_approx_candidates\n", 0, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "=> bdb_approx_candidates\n", 0, 0, 0 );
 #endif
@@ -514,7 +529,8 @@ approx_candidates(
 
        if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_approx_candidates: index_param failed (%d)\n", rc ));
+               LDAP_LOG ( INDEX, RESULTS, 
+                       "<= bdb_approx_candidates: index_param failed (%d)\n", rc, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "<= bdb_approx_candidates: index_param failed (%d)\n",
@@ -525,7 +541,8 @@ approx_candidates(
 
        if ( db == NULL ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_approx_candidates: not indexed\n" ));
+               LDAP_LOG(INDEX, RESULTS, 
+                       "<= bdb_approx_candidates: not indexed\n",0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "<= bdb_approx_candidates: not indexed\n", 0, 0, 0 );
@@ -558,7 +575,8 @@ approx_candidates(
 
        if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_approx_candidates: MR filter failed (%d)\n", rc ));
+               LDAP_LOG ( INDEX, RESULTS, 
+                       "<= bdb_approx_candidates: MR filter failed (%d)\n", rc, 0, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "<= bdb_approx_candidates: (%s) MR filter failed (%d)\n",
@@ -569,7 +587,8 @@ approx_candidates(
 
        if( keys == NULL ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_approx_candidates: no keys (%s)\n", prefix.bv_val ));
+               LDAP_LOG ( INDEX, RESULTS, 
+                       "<= bdb_approx_candidates: no keys (%s)\n", prefix.bv_val, 0, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "<= bdb_approx_candidates: no keys (%s)\n",
@@ -587,7 +606,8 @@ approx_candidates(
                        break;
                } else if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_approx_candidates: key read failed (%d)\n", rc ));
+               LDAP_LOG ( INDEX, RESULTS, 
+                       "<= bdb_approx_candidates: key read failed (%d)\n", rc, 0, 0);
 #else
                        Debug( LDAP_DEBUG_TRACE, "<= bdb_approx_candidates key read failed (%d)\n",
                                rc, 0, 0 );
@@ -597,7 +617,8 @@ approx_candidates(
 
                if( BDB_IDL_IS_ZERO( tmp ) ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_approx_candidates: NULL\n" ));
+                       LDAP_LOG ( INDEX, RESULTS, 
+                               "<= bdb_approx_candidates: NULL\n", 0, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_TRACE, "<= bdb_approx_candidates NULL\n",
                                0, 0, 0 );
@@ -615,7 +636,10 @@ approx_candidates(
        ber_bvarray_free( keys );
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_approx_candidates: id=%ld first=%ld last=%ld\n", (long) ids[0], (long) BDB_IDL_FIRST( ids ), (long) BDB_IDL_LAST( ids ) ));
+       LDAP_LOG ( INDEX, RESULTS, 
+               "<= bdb_approx_candidates: id=%ld first=%ld last=%ld\n", 
+               (long) ids[0], (long) BDB_IDL_FIRST( ids ), 
+               (long) BDB_IDL_LAST( ids ) );
 #else
        Debug( LDAP_DEBUG_TRACE, "<= bdb_approx_candidates %ld, first=%ld, last=%ld\n",
                (long) ids[0],
@@ -641,7 +665,7 @@ substring_candidates(
        MatchingRule *mr;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "filterindex", LDAP_LEVEL_ENTRY, "=> bdb_substring_candidates\n"));
+       LDAP_LOG ( INDEX, ENTRY, "=> bdb_substring_candidates\n", 0, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "=> bdb_substring_candidates\n", 0, 0, 0 );
 #endif
@@ -651,7 +675,8 @@ substring_candidates(
 
        if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_substring_candidates: index_param failed (%d)\n", rc ));
+               LDAP_LOG ( INDEX, RESULTS, 
+                       "<= bdb_substring_candidates: index_param failed (%d)\n", rc, 0, 0);
 #else
                Debug( LDAP_DEBUG_ANY,
                        "<= bdb_substring_candidates: index_param failed (%d)\n",
@@ -662,7 +687,8 @@ substring_candidates(
 
        if ( db == NULL ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_substring_candidates: not indexed\n"));
+               LDAP_LOG ( INDEX, RESULTS, 
+                       "<= bdb_substring_candidates: not indexed\n", 0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "<= bdb_substring_candidates not indexed\n",
@@ -692,7 +718,9 @@ substring_candidates(
 
        if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_substring_candidates: (%s) MR filter failed (%d)\n", sub->sa_desc->ad_cname.bv_val, rc ));
+               LDAP_LOG ( INDEX, RESULTS, 
+                       "<= bdb_substring_candidates: (%s) MR filter failed (%d)\n", 
+                       sub->sa_desc->ad_cname.bv_val, rc, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "<= bdb_substring_candidates: (%s) MR filter failed (%d)\n",
@@ -703,7 +731,9 @@ substring_candidates(
 
        if( keys == NULL ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_substring_candidates: (%s) MR filter failed (%d)\n", mask, sub->sa_desc->ad_cname.bv_val ));
+               LDAP_LOG ( INDEX, RESULTS, 
+                       "<= bdb_substring_candidates: (%d) MR filter failed (%s)\n", 
+                       mask, sub->sa_desc->ad_cname.bv_val, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "<= bdb_substring_candidates: (0x%04lx) no keys (%s)\n",
@@ -721,7 +751,8 @@ substring_candidates(
                        break;
                } else if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_substring_candidates: key read failed (%d)\n", rc));
+                       LDAP_LOG ( INDEX, RESULTS, 
+                               "<= bdb_substring_candidates: key read failed (%d)\n", rc, 0,0);
 #else
                        Debug( LDAP_DEBUG_TRACE, "<= bdb_substring_candidates key read failed (%d)\n",
                                rc, 0, 0 );
@@ -731,7 +762,8 @@ substring_candidates(
 
                if( BDB_IDL_IS_ZERO( tmp ) ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_substring_candidates: NULL \n" ));
+                       LDAP_LOG ( INDEX, RESULTS, 
+                               "<= bdb_substring_candidates: NULL \n", 0, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_TRACE, "<= bdb_substring_candidates NULL\n",
                                0, 0, 0 );
@@ -749,7 +781,10 @@ substring_candidates(
        ber_bvarray_free( keys );
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_substring_candidates: id=%ld first=%ld last=%ld\n", (long) ids[0], (long) BDB_IDL_FIRST( ids ), (long) BDB_IDL_LAST( ids ) ));
+       LDAP_LOG ( INDEX, RESULTS, 
+               "<= bdb_substring_candidates: id=%ld first=%ld last=%ld\n",
+               (long) ids[0], (long) BDB_IDL_FIRST( ids ), 
+               (long) BDB_IDL_LAST( ids ) );
 #else
        Debug( LDAP_DEBUG_TRACE, "<= bdb_substring_candidates %ld, first=%ld, last=%ld\n",
                (long) ids[0],
Cloned from git://git.openldap.org/openldap.git