From 02412251f15514b747c468d2a78b7648367a967f Mon Sep 17 00:00:00 2001 From: Julius Enarusai Date: Thu, 14 Mar 2002 16:34:24 +0000 Subject: [PATCH] Added LDAP_LOG messages to the above files to match the existing Debug messages --- servers/slapd/back-bdb/filterindex.c | 190 ++++++++++++++++++++++++++- servers/slapd/back-bdb/search.c | 44 +++++++ 2 files changed, 232 insertions(+), 2 deletions(-) diff --git a/servers/slapd/back-bdb/filterindex.c b/servers/slapd/back-bdb/filterindex.c index c2993677c9..8387a702ba 100644 --- a/servers/slapd/back-bdb/filterindex.c +++ b/servers/slapd/back-bdb/filterindex.c @@ -49,78 +49,134 @@ bdb_filter_candidates( ID *tmp ) { int rc = -1; +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_ENTRY, "=> bdb_filter_candidates\n")); +#else Debug( LDAP_DEBUG_FILTER, "=> bdb_filter_candidates\n", 0, 0, 0 ); +#endif switch ( f->f_choice ) { case SLAPD_FILTER_DN_ONE: +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tDN ONE\n")); +#else Debug( LDAP_DEBUG_FILTER, "\tDN ONE\n", 0, 0, 0 ); +#endif rc = bdb_dn2idl( be, f->f_dn, DN_ONE_PREFIX, ids ); break; case SLAPD_FILTER_DN_SUBTREE: +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tDN SUBTREE\n")); +#else Debug( LDAP_DEBUG_FILTER, "\tDN SUBTREE\n", 0, 0, 0 ); +#endif rc = bdb_dn2idl( be, f->f_dn, DN_SUBTREE_PREFIX, ids ); break; case LDAP_FILTER_PRESENT: +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tPRESENT\n")); +#else Debug( LDAP_DEBUG_FILTER, "\tPRESENT\n", 0, 0, 0 ); +#endif rc = presence_candidates( be, f->f_desc, ids ); break; case LDAP_FILTER_EQUALITY: +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tEQUALITY\n")); +#else Debug( LDAP_DEBUG_FILTER, "\tEQUALITY\n", 0, 0, 0 ); +#endif rc = equality_candidates( be, f->f_ava, ids, tmp ); break; case LDAP_FILTER_APPROX: +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tAPPROX\n")); +#else Debug( LDAP_DEBUG_FILTER, "\tAPPROX\n", 0, 0, 0 ); +#endif rc = approx_candidates( be, f->f_ava, ids, tmp ); break; case LDAP_FILTER_SUBSTRINGS: +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tSUBSTRINGS\n")); +#else Debug( LDAP_DEBUG_FILTER, "\tSUBSTRINGS\n", 0, 0, 0 ); +#endif rc = substring_candidates( be, f->f_sub, ids, tmp ); break; case LDAP_FILTER_GE: /* no GE index, use pres */ +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tGE\n")); +#else Debug( LDAP_DEBUG_FILTER, "\tGE\n", 0, 0, 0 ); +#endif rc = presence_candidates( be, f->f_ava->aa_desc, ids ); break; case LDAP_FILTER_LE: /* no LE index, use pres */ +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tLE\n")); +#else Debug( LDAP_DEBUG_FILTER, "\tLE\n", 0, 0, 0 ); +#endif rc = presence_candidates( be, f->f_ava->aa_desc, ids ); break; case LDAP_FILTER_NOT: /* no indexing to support NOT filters */ +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tNOT\n")); +#else Debug( LDAP_DEBUG_FILTER, "\tNOT\n", 0, 0, 0 ); +#endif break; case LDAP_FILTER_AND: +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tAND\n")); +#else Debug( LDAP_DEBUG_FILTER, "\tAND\n", 0, 0, 0 ); +#endif rc = list_candidates( be, f->f_and, LDAP_FILTER_AND, ids, tmp ); break; case LDAP_FILTER_OR: +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tOR\n")); +#else Debug( LDAP_DEBUG_FILTER, "\tOR\n", 0, 0, 0 ); +#endif rc = list_candidates( be, f->f_or, LDAP_FILTER_OR, ids, tmp ); break; default: +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tUNKNOWN\n")); +#else Debug( LDAP_DEBUG_FILTER, "\tUNKNOWN %d\n", 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 ) )); +#else Debug( LDAP_DEBUG_FILTER, "<= bdb_filter_candidates: id=%ld first=%ld last=%ld\n", (long) ids[0], (long) BDB_IDL_FIRST( ids ), (long) BDB_IDL_LAST( ids ) ); +#endif return rc; } @@ -145,7 +201,11 @@ list_candidates( ID save[BDB_IDL_UM_SIZE]; #endif +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_list_candidates: 0x%x\n", ftype)); +#else Debug( LDAP_DEBUG_FILTER, "=> bdb_list_candidates 0x%x\n", ftype, 0, 0 ); +#endif if ( ftype == LDAP_FILTER_OR ) { BDB_IDL_ALL( bdb, save ); @@ -180,16 +240,24 @@ list_candidates( #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 ) )); +#else Debug( LDAP_DEBUG_FILTER, "<= bdb_list_candidates: id=%ld first=%ld last=%ld\n", (long) ids[0], (long) BDB_IDL_FIRST(ids), (long) BDB_IDL_LAST(ids) ); +#endif } else { +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "<= bdb_list_candidates: rc=%d\n", rc)); +#else Debug( LDAP_DEBUG_FILTER, "<= bdb_list_candidates: undefined rc=%d\n", rc, 0, 0 ); +#endif } return rc; @@ -207,7 +275,11 @@ presence_candidates( slap_mask_t mask; struct berval prefix = {0}; +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_ENTRY, "=> bdb_presence_candidates\n")); +#else Debug( LDAP_DEBUG_TRACE, "=> bdb_presence_candidates\n", 0, 0, 0 ); +#endif if( desc == slap_schema.si_ad_objectClass ) { BDB_IDL_ALL( bdb, ids ); @@ -218,24 +290,36 @@ presence_candidates( &db, &mask, &prefix ); if( rc != LDAP_SUCCESS ) { +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "=> bdb_presence_candidates: index_parm returned=%d\n", rc )); +#else Debug( LDAP_DEBUG_TRACE, "<= bdb_presence_candidates: index_param returned=%d\n", rc, 0, 0 ); +#endif return 0; } if( db == NULL ) { /* not indexed */ +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_presence_candidates: not indexed\n" )); +#else Debug( LDAP_DEBUG_TRACE, "<= bdb_presence_candidates: not indexed\n", 0, 0, 0 ); +#endif return 0; } if( prefix.bv_val == NULL ) { +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_presence_candidates: no prefix\n" )); +#else Debug( LDAP_DEBUG_TRACE, "<= bdb_presence_candidates: no prefix\n", 0, 0, 0 ); +#endif return 0; } @@ -245,17 +329,25 @@ presence_candidates( BDB_IDL_ZERO( ids ); 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 )); +#else Debug( LDAP_DEBUG_TRACE, "<= bdb_presense_candidates: key read failed (%d)\n", rc, 0, 0 ); +#endif goto done; } +#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 ) )); +#else Debug(LDAP_DEBUG_TRACE, "<= bdb_presence_candidates: id=%ld first=%ld last=%ld\n", (long) ids[0], (long) BDB_IDL_FIRST(ids), (long) BDB_IDL_LAST(ids) ); +#endif done: return rc; @@ -276,21 +368,33 @@ equality_candidates( struct berval *keys = NULL; MatchingRule *mr; +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_ENTRY, "=> equality_candidates\n")); +#else Debug( LDAP_DEBUG_TRACE, "=> bdb_equality_candidates\n", 0, 0, 0 ); +#endif rc = bdb_index_param( be, ava->aa_desc, LDAP_FILTER_EQUALITY, &db, &mask, &prefix ); if( rc != LDAP_SUCCESS ) { +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "=> bdb_equality_candidates: index_param failed (%d)\n", rc)); +#else Debug( LDAP_DEBUG_ANY, "<= bdb_equality_candidates: index_param failed (%d)\n", rc, 0, 0 ); +#endif return rc; } if ( db == NULL ) { +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "=> bdb_equality_candidates: not indexed\n")); +#else Debug( LDAP_DEBUG_ANY, "<= bdb_equality_candidates: not indexed\n", 0, 0, 0 ); +#endif return -1; } @@ -313,16 +417,24 @@ equality_candidates( &keys ); if( rc != LDAP_SUCCESS ) { +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "=> bdb_equality_candidates: MR filter failed (%d)\n", rc)); +#else Debug( LDAP_DEBUG_TRACE, "<= bdb_equality_candidates: MR filter failed (%d)\n", rc, 0, 0 ); +#endif return rc; } if( keys == NULL ) { +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "=> bdb_equality_candidates: no keys\n")); +#else Debug( LDAP_DEBUG_TRACE, "<= bdb_equality_candidates: no keys\n", 0, 0, 0 ); +#endif return 0; } @@ -333,16 +445,24 @@ equality_candidates( BDB_IDL_ZERO( ids ); 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)); +#else Debug( LDAP_DEBUG_TRACE, "<= bdb_equality_candidates key read failed (%d)\n", rc, 0, 0 ); +#endif break; } if( BDB_IDL_IS_ZERO( tmp ) ) { +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "=> bdb_equality_candidates: NULL\n")); +#else Debug( LDAP_DEBUG_TRACE, "<= bdb_equality_candidates NULL\n", 0, 0, 0 ); +#endif BDB_IDL_ZERO( ids ); break; } @@ -355,11 +475,15 @@ 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 ) )); +#else Debug( LDAP_DEBUG_TRACE, "<= bdb_equality_candidates id=%ld, first=%ld, last=%ld\n", (long) ids[0], (long) BDB_IDL_FIRST(ids), (long) BDB_IDL_LAST(ids) ); +#endif return( rc ); } @@ -379,21 +503,33 @@ approx_candidates( struct berval *keys = NULL; MatchingRule *mr; +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_ENTRY, "=> bdb_approx_candidates\n")); +#else Debug( LDAP_DEBUG_TRACE, "=> bdb_approx_candidates\n", 0, 0, 0 ); +#endif rc = bdb_index_param( be, ava->aa_desc, LDAP_FILTER_APPROX, &db, &mask, &prefix ); if( rc != LDAP_SUCCESS ) { +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_approx_candidates: index_param failed (%d)\n", rc )); +#else Debug( LDAP_DEBUG_ANY, "<= bdb_approx_candidates: index_param failed (%d)\n", rc, 0, 0 ); +#endif return rc; } if ( db == NULL ) { +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_approx_candidates: not indexed\n" )); +#else Debug( LDAP_DEBUG_ANY, "<= bdb_approx_candidates: not indexed\n", 0, 0, 0 ); +#endif return -1; } @@ -421,16 +557,24 @@ approx_candidates( &keys ); if( rc != LDAP_SUCCESS ) { +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_approx_candidates: MR filter failed (%d)\n", rc )); +#else Debug( LDAP_DEBUG_TRACE, "<= bdb_approx_candidates: (%s) MR filter failed (%d)\n", prefix.bv_val, rc, 0 ); +#endif return rc; } if( keys == NULL ) { +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_approx_candidates: no keys (%s)\n", prefix.bv_val )); +#else Debug( LDAP_DEBUG_TRACE, "<= bdb_approx_candidates: no keys (%s)\n", prefix.bv_val, 0, 0 ); +#endif return 0; } @@ -442,14 +586,22 @@ approx_candidates( rc = 0; break; } else if( rc != LDAP_SUCCESS ) { +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_approx_candidates: key read failed (%d)\n", rc )); +#else Debug( LDAP_DEBUG_TRACE, "<= bdb_approx_candidates key read failed (%d)\n", rc, 0, 0 ); +#endif break; } if( BDB_IDL_IS_ZERO( tmp ) ) { +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_approx_candidates: NULL\n" )); +#else Debug( LDAP_DEBUG_TRACE, "<= bdb_approx_candidates NULL\n", 0, 0, 0 ); +#endif BDB_IDL_ZERO( ids ); break; } @@ -462,11 +614,14 @@ 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 ) )); +#else Debug( LDAP_DEBUG_TRACE, "<= bdb_approx_candidates %ld, first=%ld, last=%ld\n", (long) ids[0], (long) BDB_IDL_FIRST(ids), (long) BDB_IDL_LAST(ids) ); - +#endif return( rc ); } @@ -485,22 +640,34 @@ substring_candidates( struct berval *keys = NULL; MatchingRule *mr; +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_ENTRY, "=> bdb_substring_candidates\n")); +#else Debug( LDAP_DEBUG_TRACE, "=> bdb_substring_candidates\n", 0, 0, 0 ); +#endif rc = bdb_index_param( be, sub->sa_desc, LDAP_FILTER_SUBSTRINGS, &db, &mask, &prefix ); if( rc != LDAP_SUCCESS ) { +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_substring_candidates: index_param failed (%d)\n", rc )); +#else Debug( LDAP_DEBUG_ANY, "<= bdb_substring_candidates: index_param failed (%d)\n", rc, 0, 0 ); +#endif return rc; } if ( db == NULL ) { +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_substring_candidates: not indexed\n")); +#else Debug( LDAP_DEBUG_ANY, "<= bdb_substring_candidates not indexed\n", 0, 0, 0 ); +#endif return -1; } @@ -524,16 +691,24 @@ substring_candidates( &keys ); 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 )); +#else Debug( LDAP_DEBUG_TRACE, "<= bdb_substring_candidates: (%s) MR filter failed (%d)\n", sub->sa_desc->ad_cname.bv_val, rc, 0 ); +#endif return rc; } 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 )); +#else Debug( LDAP_DEBUG_TRACE, "<= bdb_substring_candidates: (0x%04lx) no keys (%s)\n", mask, sub->sa_desc->ad_cname.bv_val, 0 ); +#endif return 0; } @@ -545,14 +720,22 @@ substring_candidates( rc = 0; break; } else if( rc != LDAP_SUCCESS ) { +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_substring_candidates: key read failed (%d)\n", rc)); +#else Debug( LDAP_DEBUG_TRACE, "<= bdb_substring_candidates key read failed (%d)\n", rc, 0, 0 ); +#endif break; } if( BDB_IDL_IS_ZERO( tmp ) ) { +#ifdef NEW_LOGGING + LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_substring_candidates: NULL \n" )); +#else Debug( LDAP_DEBUG_TRACE, "<= bdb_substring_candidates NULL\n", 0, 0, 0 ); +#endif BDB_IDL_ZERO( ids ); break; } @@ -565,11 +748,14 @@ 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 ) )); +#else Debug( LDAP_DEBUG_TRACE, "<= bdb_substring_candidates %ld, first=%ld, last=%ld\n", (long) ids[0], (long) BDB_IDL_FIRST(ids), (long) BDB_IDL_LAST(ids) ); - +#endif return( 0 ); } diff --git a/servers/slapd/back-bdb/search.c b/servers/slapd/back-bdb/search.c index 0c1d283c56..df7ce17dd2 100644 --- a/servers/slapd/back-bdb/search.c +++ b/servers/slapd/back-bdb/search.c @@ -60,8 +60,12 @@ bdb_search( struct slap_limits_set *limit = NULL; int isroot = 0; +#ifdef NEW_LOGGING + LDAP_LOG (( "search", LDAP_LEVEL_ENTRY,"bdb_back_search\n")); +#else Debug( LDAP_DEBUG_TRACE, "=> bdb_back_search\n", 0, 0, 0); +#endif manageDSAit = get_manageDSAit( op ); @@ -150,8 +154,12 @@ bdb_search( ber_bvarray_free( erefs ); } +#ifdef NEW_LOGGING + LDAP_LOG (( "search", LDAP_LEVEL_RESULTS,"bdb_search: entry is referral\n")); +#else Debug( LDAP_DEBUG_TRACE, "bdb_search: entry is referral\n", 0, 0, 0 ); +#endif send_ldap_result( conn, op, LDAP_REFERRAL, matched_dn.bv_val, @@ -258,8 +266,12 @@ bdb_search( e = NULL; if ( candidates[0] == 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG (( "search", LDAP_LEVEL_RESULTS,"bdb_search: no candidates\n")); +#else Debug( LDAP_DEBUG_TRACE, "bdb_search: no candidates\n", 0, 0, 0 ); +#endif send_search_result( conn, op, LDAP_SUCCESS, @@ -309,9 +321,13 @@ bdb_search( if ( e == NULL ) { if( !BDB_IDL_IS_RANGE(candidates) ) { /* only complain for non-range IDLs */ +#ifdef NEW_LOGGING + LDAP_LOG (( "search", LDAP_LEVEL_RESULTS,"bdb_search: candidate %ld not found\n", (long) id)); +#else Debug( LDAP_DEBUG_TRACE, "bdb_search: candidate %ld not found\n", (long) id, 0, 0 ); +#endif } goto loop_continue; @@ -367,9 +383,13 @@ bdb_search( } else if ( dnIsSuffix( &e->e_nname, &realbase ) ) { /* alias is within scope */ +#ifdef NEW_LOGGING + LDAP_LOG (( "search", LDAP_LEVEL_RESULTS,"bdb_search: \"%s\" in subtree\n", e->edn)); +#else Debug( LDAP_DEBUG_TRACE, "bdb_search: \"%s\" in subtree\n", e->e_dn, 0, 0 ); +#endif goto loop_continue; } @@ -457,14 +477,22 @@ bdb_search( } } } else { +#ifdef NEW_LOGGING + LDAP_LOG (( "search", LDAP_LEVEL_RESULTS,"bdb_search: %ld scope not okay\n", (long) id)); +#else Debug( LDAP_DEBUG_TRACE, "bdb_search: %ld scope not okay\n", (long) id, 0, 0 ); +#endif } } else { +#ifdef NEW_LOGGING + LDAP_LOG (( "search", LDAP_LEVEL_RESULTS,"bdb_search: %ld does match filter\n", (long) id)); +#else Debug( LDAP_DEBUG_TRACE, "bdb_search: %ld does match filter\n", (long) id, 0, 0 ); +#endif } loop_continue: @@ -500,8 +528,12 @@ static int base_candidate( Entry *e, ID *ids ) { +#ifdef NEW_LOGGING + LDAP_LOG (( "search", LDAP_LEVEL_ENTRY,"base_candidate: base: \"%s\" (0x%08lx)\n", e->e_dn, (long) e->e_id)); +#else Debug(LDAP_DEBUG_ARGS, "base_candidates: base: \"%s\" (0x%08lx)\n", e->e_dn, (long) e->e_id, 0); +#endif ids[0] = 1; ids[1] = e->e_id; @@ -571,9 +603,13 @@ static int search_candidates( * (|[(objectClass=referral)(objectClass=alias)](user-filter)) */ +#ifdef NEW_LOGGING + LDAP_LOG (( "search", LDAP_LEVEL_ENTRY,"search_candidates: base=\"%s\" (0x%08lx) scope=%d\n", e->e_dn, (long) e->e_id, scope)); +#else Debug(LDAP_DEBUG_TRACE, "search_candidates: base=\"%s\" (0x%08lx) scope=%d\n", e->e_dn, (long) e->e_id, scope ); +#endif xf.f_or = filter; xf.f_choice = LDAP_FILTER_OR; @@ -630,16 +666,24 @@ static int search_candidates( rc = bdb_filter_candidates( be, &f, ids, tmp ); if( rc ) { +#ifdef NEW_LOGGING + LDAP_LOG (( "search", LDAP_LEVEL_DETAIL1,"bdb_search_candidates: failed (rc=%d)\n", rc)); +#else Debug(LDAP_DEBUG_TRACE, "bdb_search_candidates: failed (rc=%d)\n", rc, NULL, NULL ); +#endif } else { +#ifdef NEW_LOGGING + LDAP_LOG (( "search", LDAP_LEVEL_DETAIL1,"bdb_search_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_search_candidates: id=%ld first=%ld last=%ld\n", (long) ids[0], (long) BDB_IDL_FIRST(ids), (long) BDB_IDL_LAST(ids) ); +#endif } return rc; -- 2.39.5