upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-25 17:19:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Coverted LDAP_LOG macro to use subsystem ID int values instead of string values

Browse source
This commit is contained in:
Julius Enarusai 2002-07-11 20:33:24 +00:00
parent 2adfd47e88
commit 6107ba67d2
177 changed files with 3563 additions and 3599 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
clients/tools/ldapmodify.c
View file

@ -582,10 +582,6 @@ main( int argc, char **argv )
(void) SIGNAL( SIGPIPE, SIG_IGN );
#endif
#ifdef NEW_LOGGING
lutil_log_initialize( argc, argv );
#endif
if ( !not ) {
if( ( ldaphost != NULL || ldapport ) && ( ldapuri == NULL ) ) {
if ( verbose ) {

56
include/ldap_log.h
View file

@ -35,21 +35,29 @@ LDAP_BEGIN_DECL
* reflect the number of subsystems and LDAP_SUBSYS_MAX reflect
* the largest subsystem number.
*/
#define LDAP_SUBSYS_NUM 12
#define LDAP_SUBSYS_MAX 11
#define LDAP_SUBSYS_NUM 20
#define LDAP_SUBSYS_MAX 19
#define LDAP_SUBSYS_GLOBAL 0
#define LDAP_SUBSYS_OPERATION 1
#define LDAP_SUBSYS_TRANSPORT 2
#define LDAP_SUBSYS_CONNECTION 3
#define LDAP_SUBSYS_FILTER 4
#define LDAP_SUBSYS_BACKEND 5
#define LDAP_SUBSYS_BER 6
#define LDAP_SUBSYS_CONFIG 7
#define LDAP_SUBSYS_ACL 8
#define LDAP_SUBSYS_CACHE 9
#define LDAP_SUBSYS_INDEX 10
#define LDAP_SUBSYS_LDIF 11
#define LDAP_SUBSYS_BER 5
#define LDAP_SUBSYS_CONFIG 6
#define LDAP_SUBSYS_ACL 7
#define LDAP_SUBSYS_CACHE 8
#define LDAP_SUBSYS_INDEX 9
#define LDAP_SUBSYS_LDIF 10
#define LDAP_SUBSYS_TOOLS 11
#define LDAP_SUBSYS_SLAPD 12
#define LDAP_SUBSYS_SLURPD 13
#define LDAP_SUBSYS_BACKEND 14
#define LDAP_SUBSYS_BACK_BDB 15
#define LDAP_SUBSYS_BACK_LDBM 16
#define LDAP_SUBSYS_BACK_LDAP 17
#define LDAP_SUBSYS_BACK_META 18
#define LDAP_SUBSYS_BACK_MON 19
/*
* debug reporting levels.
@ -125,27 +133,37 @@ LDAP_BEGIN_DECL
} while ( 0 )
# endif
#ifndef LDAP_LOG
# define LDAP_LOG(a) lutil_log a
#endif
#else /* LDAP_DEBUG */
# define Debug( level, fmt, arg1, arg2, arg3 )
#ifndef LDAP_LOG
# define LDAP_LOG(a)
#endif
#endif /* LDAP_DEBUG */
#ifdef NEW_LOGGING
extern int ldap_loglevels[LDAP_SUBSYS_NUM];
#define LDAP_LOG(a, b, fmt, arg1, arg2, arg3) do {\
if (ldap_loglevels[LDAP_SUBSYS_##a] >= LDAP_LEVEL_##b || \
ldap_loglevels[LDAP_SUBSYS_GLOBAL] >= LDAP_LEVEL_##b)\
lutil_log (LDAP_SUBSYS_##a, LDAP_LEVEL_##b, fmt, arg1, arg2, arg3); \
} while (0)
#define LDAP_LOGS_TEST(a, b) \
(ldap_loglevels[LDAP_SUBSYS_##a] >= LDAP_LEVEL_##b || \
ldap_loglevels[LDAP_SUBSYS_GLOBAL] >= LDAP_LEVEL_##b)
#endif /* LDAP_LOG */
#ifndef LDAP_LOG
#define LDAP_LOG(a, b, fmt, arg1, arg2, arg3)
#endif
LDAP_LUTIL_F(int) lutil_mnem2level LDAP_P(( const char *level ));
LDAP_LUTIL_F(void) lutil_log_initialize LDAP_P((
int argc, char **argv ));
LDAP_LUTIL_F(void) lutil_set_debug_level LDAP_P((
LDAP_LUTIL_F(int) lutil_set_debug_level LDAP_P((
const char *subsys, int level ));
LDAP_LUTIL_F(void) lutil_log LDAP_P((
const char *subsys, int level, const char *fmt, ... ));
const int subsys, int level, const char *fmt, ... ));
LDAP_LUTIL_F(int) lutil_debug_file LDAP_P(( FILE *file ));

8
libraries/liblber/Makefile.in
View file

@ -12,16 +12,16 @@ NT_OBJS = nt_err.lo
LIB_DEFS = -DLBER_LIBRARY
SRCS= assert.c decode.c encode.c io.c bprint.c \
SRCS= assert.c decode.c encode.c io.c bprint.c debug.c \
memory.c options.c sockbuf.c $(@PLAT@_SRCS)
OBJS= assert.lo decode.lo encode.lo io.lo bprint.lo \
OBJS= assert.lo decode.lo encode.lo io.lo bprint.lo debug.lo\
memory.lo options.lo sockbuf.lo $(@PLAT@_OBJS)
XSRCS= version.c
PROGRAMS= dtest etest idtest
LDAP_INCDIR= ../../include
LDAP_LIBDIR= ../../libraries
LDAP_INCDIR= ../../include
LDAP_LIBDIR= ../../libraries
XLIBS = $(LIBRARY)
XXLIBS =

10
libraries/liblber/decode.c
View file

@ -643,8 +643,10 @@ ber_scanf ( BerElement *ber,
fmt_reset = fmt;
#ifdef NEW_LOGGING
LDAP_LOG(( "liblber", LDAP_LEVEL_ENTRY, "ber_scanf fmt (%s) ber:\n", fmt ));
BER_DUMP(( "liblber", LDAP_LEVEL_DETAIL2, ber, 1 ));
LDAP_LOG( BER, ENTRY, "ber_scanf fmt (%s) ber:\n", fmt, 0, 0 );
if ( LDAP_LOGS_TEST(BER, DETAIL2 ))
BER_DUMP(( "liblber", LDAP_LEVEL_DETAIL2, ber, 1 ));
#else
ber_log_printf( LDAP_DEBUG_TRACE, ber->ber_debug,
"ber_scanf fmt (%s) ber:\n", fmt );
@ -796,8 +798,8 @@ ber_scanf ( BerElement *ber,
default:
if( ber->ber_debug ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "liblber", LDAP_LEVEL_ERR,
"ber_scanf: unknown fmt %c\n", *fmt ));
LDAP_LOG( BER, ERR,
"ber_scanf: unknown fmt %c\n", *fmt, 0, 0 );
#else
ber_log_printf( LDAP_DEBUG_ANY, ber->ber_debug,
"ber_scanf: unknown fmt %c\n", *fmt );

4
libraries/liblber/encode.c
View file

@ -812,8 +812,8 @@ ber_printf( BerElement *ber, LDAP_CONST char *fmt, ... )
default:
if( ber->ber_debug ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "liblber", LDAP_LEVEL_ERR,
"ber_printf: unknown fmt %c\n", *fmt ));
LDAP_LOG( BER, ERR,
"ber_printf: unknown fmt %c\n", *fmt, 0, 0 );
#else
ber_log_printf( LDAP_DEBUG_ANY, ber->ber_debug,
"ber_printf: unknown fmt %c\n", *fmt );

25
libraries/liblber/io.c
View file

@ -33,6 +33,7 @@
#endif
#include "lber-int.h"
#include "ldap_log.h"
ber_slen_t
ber_read(
@ -207,11 +208,14 @@ ber_flush( Sockbuf *sb, BerElement *ber, int freeit )
if ( sb->sb_debug ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "liblber", LDAP_LEVEL_DETAIL1,
LDAP_LOG( BER, DETAIL1,
"ber_flush: %ld bytes to sd %ld%s\n",
towrite, (long)sb->sb_fd,
ber->ber_rwptr != ber->ber_buf ? " (re-flush)" : "" ));
BER_DUMP(( "liblber", LDAP_LEVEL_DETAIL2, ber, 1 ));
ber->ber_rwptr != ber->ber_buf ? " (re-flush)" : "" );
if(LDAP_LOGS_TEST(BER, DETAIL2))
BER_DUMP(( "liblber", LDAP_LEVEL_DETAIL2, ber, 1 ));
#else
ber_log_printf( LDAP_DEBUG_ANY, sb->sb_debug,
"ber_flush: %ld bytes to sd %ld%s\n",
@ -441,7 +445,7 @@ ber_get_next(
assert( LBER_VALID( ber ) );
#ifdef NEW_LOGGING
LDAP_LOG(( "liblber", LDAP_LEVEL_ENTRY, "ber_get_next: enter\n" ));
LDAP_LOG( BER, ENTRY, "ber_get_next: enter\n", 0, 0, 0 );
#else
ber_log_printf( LDAP_DEBUG_TRACE, ber->ber_debug,
"ber_get_next\n" );
@ -550,9 +554,9 @@ ber_get_next(
return LBER_DEFAULT;
} else if ( sb->sb_max_incoming && ber->ber_len > sb->sb_max_incoming ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "liblber", LDAP_LEVEL_ERR,
LDAP_LOG( BER, ERR,
"ber_get_next: sockbuf_max_incoming limit hit "
"(%d > %d)\n", ber->ber_len, sb->sb_max_incoming ));
"(%d > %d)\n", ber->ber_len, sb->sb_max_incoming, 0 );
#else
ber_log_printf( LDAP_DEBUG_CONNS, ber->ber_debug,
"ber_get_next: sockbuf_max_incoming limit hit "
@ -618,10 +622,11 @@ done:
*len = ber->ber_len;
if ( ber->ber_debug ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "liblber", LDAP_LEVEL_DETAIL1,
"ber_get_next: tag 0x%lx len %ld\n",
ber->ber_tag, ber->ber_len ));
BER_DUMP(( "liblber", LDAP_LEVEL_DETAIL2, ber, 1 ));
LDAP_LOG( BER, DETAIL1,
"ber_get_next: tag 0x%lx len %ld\n",
ber->ber_tag, ber->ber_len, 0 );
if(LDAP_LOGS_TEST(BER, DETAIL2))
BER_DUMP(( "liblber", LDAP_LEVEL_DETAIL2, ber, 1 ));
#else
ber_log_printf( LDAP_DEBUG_TRACE, ber->ber_debug,
"ber_get_next: tag 0x%lx len %ld contents:\n",

4
libraries/liblber/lber-int.h
View file

@ -38,16 +38,20 @@ struct lber_options {
};
#ifdef NEW_LOGGING
/*
# ifdef LDAP_DEBUG
# ifdef LDAP_LOG
# undef LDAP_LOG
# endif
# define LDAP_LOG(a) ber_pvt_log_output a
*/
# define BER_DUMP(a) ber_output_dump a
/*
# else
# define LDAP_LOG(a)
# define BER_DUMP(a)
# endif
*/
#endif
LBER_F( int ) ber_pvt_log_output(

7
libraries/libldap/abandon.c
View file

@ -58,7 +58,7 @@ ldap_abandon_ext(
{
int rc;
#ifdef NEW_LOGGING
LDAP_LOG (( "abandon", LDAP_LEVEL_ARGS, "ldap_abandon_ext %d\n", msgid ));
LDAP_LOG ( OPERATION, ARGS, "ldap_abandon_ext %d\n", msgid, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_abandon_ext %d\n", msgid, 0, 0 );
#endif
@ -86,7 +86,7 @@ int
ldap_abandon( LDAP *ld, int msgid )
{
#ifdef NEW_LOGGING
LDAP_LOG (( "abandon", LDAP_LEVEL_ARGS, "ldap_abandon %d\n", msgid ));
LDAP_LOG ( OPERATION, ARGS, "ldap_abandon %d\n", msgid, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_abandon %d\n", msgid, 0, 0 );
#endif
@ -110,8 +110,7 @@ do_abandon(
LDAPRequest *lr;
#ifdef NEW_LOGGING
LDAP_LOG (( "abandon", LDAP_LEVEL_ARGS, "do_abandon %d, msgid %d\n",
origid, msgid ));
LDAP_LOG ( OPERATION, ARGS, "do_abandon %d, msgid %d\n", origid, msgid, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "do_abandon origid %d, msgid %d\n",
origid, msgid, 0 );

2
libraries/libldap/add.c
View file

@ -100,7 +100,7 @@ ldap_add_ext(
int i, rc;
#ifdef NEW_LOGGING
LDAP_LOG (( "add", LDAP_LEVEL_ENTRY, "ldap_add_ext\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_add_ext\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_add_ext\n", 0, 0, 0 );
#endif

6
libraries/libldap/bind.c
View file

@ -42,7 +42,7 @@
#include <ac/time.h>
#include "ldap-int.h"
#include "ldap_log.h"
/*
* ldap_bind - bind to the ldap server (and X.500). The dn and password
@ -61,7 +61,7 @@ int
ldap_bind( LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *passwd, int authmethod )
{
#ifdef NEW_LOGGING
LDAP_LOG (( "bind", LDAP_LEVEL_ENTRY, "ldap_bind\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_bind\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_bind\n", 0, 0, 0 );
#endif
@ -110,7 +110,7 @@ ldap_bind_s(
int authmethod )
{
#ifdef NEW_LOGGING
LDAP_LOG (( "bind", LDAP_LEVEL_ENTRY, "ldap_bind_s\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_bind_s\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_bind_s\n", 0, 0, 0 );
#endif

93
libraries/libldap/cache.c
View file

@ -118,7 +118,7 @@ ldap_flush_cache( LDAP *ld )
assert( LDAP_VALID( ld ) );
#ifdef NEW_LOGGING
LDAP_LOG (( "cache", LDAP_LEVEL_ENTRY, "ldap_flush_cache\n" ));
LDAP_LOG ( CACHE, ENTRY, "ldap_flush_cache\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_flush_cache\n", 0, 0, 0 );
#endif
@ -154,9 +154,9 @@ ldap_uncache_request( LDAP *ld, int msgid )
#ifndef LDAP_NOCACHE
#ifdef NEW_LOGGING
LDAP_LOG (( "cache", LDAP_LEVEL_ARGS,
"ldap_uncache_request %d ld_cache %lx\n",
msgid, (long) ld->ld_cache ));
LDAP_LOG ( CACHE, ARGS, "ldap_uncache_request %d ld_cache %lx\n",
msgid, (long) ld->ld_cache, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_uncache_request %d ld_cache %lx\n",
msgid, (long) ld->ld_cache, 0 );
@ -176,9 +176,9 @@ ldap_uncache_entry( LDAP *ld, LDAP_CONST char *dn )
#ifndef LDAP_NOCACHE
#ifdef NEW_LOGGING
LDAP_LOG (( "cache", LDAP_LEVEL_ARGS,
"ldap_uncache_entry %s ld_cache %lx\n",
dn, (long) ld->ld_cache ));
LDAP_LOG ( CACHE, ARGS, "ldap_uncache_entry %s ld_cache %lx\n",
dn, (long) ld->ld_cache, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_uncache_entry %s ld_cache %lx\n",
dn, (long) ld->ld_cache, 0 );
@ -200,9 +200,10 @@ uncache_entry_or_req( LDAP *ld,
LDAPMessage *m, *prev, *next;
#ifdef NEW_LOGGING
LDAP_LOG (( "cache", LDAP_LEVEL_ARGS,
LDAP_LOG ( CACHE, ARGS,
"uncache_entry_or_req dn %s msgid %ld ld_cache %lx\n",
dn, (long) msgid, (long) ld->ld_cache ));
dn, (long) msgid, (long) ld->ld_cache );
#else
Debug( LDAP_DEBUG_TRACE,
"ldap_uncache_entry_or_req dn %s msgid %ld ld_cache %lx\n",
@ -266,7 +267,7 @@ ldap_add_request_to_cache( LDAP *ld, ber_tag_t msgtype, BerElement *request )
assert( LDAP_VALID( ld ) );
#ifdef NEW_LOGGING
LDAP_LOG (( "cache", LDAP_LEVEL_ENTRY, "ldap_add_request_to_cache\n" ));
LDAP_LOG ( CACHE, ENTRY, "ldap_add_request_to_cache\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_add_request_to_cache\n", 0, 0, 0 );
#endif
@ -318,9 +319,10 @@ ldap_add_result_to_cache( LDAP *ld, LDAPMessage *result )
assert( result != NULL );
#ifdef NEW_LOGGING
LDAP_LOG (( "cache", LDAP_LEVEL_ARGS,
LDAP_LOG ( CACHE, ARGS,
"ldap_add_result_to_cache: id %ld, type %ld\n",
(long) result->lm_msgid, (long) result->lm_msgtype ));
(long) result->lm_msgid, (long) result->lm_msgtype, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_add_result_to_cache: id %ld, type %ld\n",
(long) result->lm_msgid, (long) result->lm_msgtype, 0 );
@ -329,8 +331,8 @@ ldap_add_result_to_cache( LDAP *ld, LDAPMessage *result )
if ( ld->ld_cache == NULL ||
( ld->ld_cache->lc_enabled == 0 )) {
#ifdef NEW_LOGGING
LDAP_LOG (( "cache", LDAP_LEVEL_DETAIL1,
"ldap_add_result_to_cache: cache disabled\n" ));
LDAP_LOG ( CACHE, DETAIL1,
"ldap_add_result_to_cache: cache disabled\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "artc: cache disabled\n", 0, 0, 0 );
#endif
@ -345,9 +347,9 @@ ldap_add_result_to_cache( LDAP *ld, LDAPMessage *result )
* only cache search and compare operations
*/
#ifdef NEW_LOGGING
LDAP_LOG (( "cache", LDAP_LEVEL_DETAIL1,
"ldap_add_result_to_cache: "
"only caching search & compare operations\n" ));
LDAP_LOG ( CACHE, DETAIL1,
"ldap_add_result_to_cache: only caching search & "
"compare operations\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"artc: only caching search & compare operations\n", 0, 0, 0 );
@ -376,9 +378,9 @@ ldap_add_result_to_cache( LDAP *ld, LDAPMessage *result )
new->lm_chain = NULL;
m->lm_chain = new;
#ifdef NEW_LOGGING
LDAP_LOG (( "cache", LDAP_LEVEL_RESULTS,
LDAP_LOG ( CACHE, RESULTS,
"ldap_add_result_to_cache: "
"result added to cache request chain\n" ));
"result added to cache request chain\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"artc: result added to cache request chain\n",
@ -418,9 +420,9 @@ ldap_add_result_to_cache( LDAP *ld, LDAPMessage *result )
if ( !keep ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "cache", LDAP_LEVEL_RESULTS,
LDAP_LOG ( CACHE, RESULTS,
"ldap_add_result_to_cache: "
"not caching result with error\n" ));
"not caching result with error\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"artc: not caching result with error %d\n",
@ -436,9 +438,9 @@ ldap_add_result_to_cache( LDAP *ld, LDAPMessage *result )
ld->ld_cache->lc_memused += msg_size( req );
check_cache_memused( ld->ld_cache );
#ifdef NEW_LOGGING
LDAP_LOG (( "cache", LDAP_LEVEL_RESULTS,
LDAP_LOG ( CACHE, RESULTS,
"ldap_add_result_to_cache: "
"cached result with error\n" ));
"cached result with error\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"artc: cached result with error %d\n",
@ -448,9 +450,8 @@ ldap_add_result_to_cache( LDAP *ld, LDAPMessage *result )
}
} else {
#ifdef NEW_LOGGING
LDAP_LOG (( "cache", LDAP_LEVEL_RESULTS,
"ldap_add_result_to_cache: "
"msgid not in request list\n" ));
LDAP_LOG ( CACHE, RESULTS,
"ldap_add_result_to_cache: msgid not in request list\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "artc: msgid not in request list\n",
0, 0, 0 );
@ -481,7 +482,7 @@ ldap_check_cache( LDAP *ld, ber_tag_t msgtype, BerElement *request )
assert( request != NULL );
#ifdef NEW_LOGGING
LDAP_LOG (( "cache", LDAP_LEVEL_ENTRY, "ldap_check_cache\n" ));
LDAP_LOG ( CACHE, ENTRY, "ldap_check_cache\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_check_cache\n", 0, 0, 0 );
#endif
@ -503,9 +504,9 @@ ldap_check_cache( LDAP *ld, ber_tag_t msgtype, BerElement *request )
hash = cache_hash( &reqber );
for ( m = ld->ld_cache->lc_buckets[ hash ]; m != NULL; m = next ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "cache", LDAP_LEVEL_DETAIL1,
LDAP_LOG ( CACHE, DETAIL1,
"ldap_check_cache: examining id %ld, type %ld\n",
(long) m->lm_msgid, (long) m->lm_msgtype ));
(long) m->lm_msgid, (long) m->lm_msgtype, 0 );
#else
Debug( LDAP_DEBUG_TRACE,"cc: examining id %ld,type %ld\n",
(long) m->lm_msgid, (long) m->lm_msgtype, 0 );
@ -519,9 +520,8 @@ ldap_check_cache( LDAP *ld, ber_tag_t msgtype, BerElement *request )
prev->lm_next = next;
}
#ifdef NEW_LOGGING
LDAP_LOG (( "cache", LDAP_LEVEL_DETAIL1,
"ldap_check_cache: expired id %ld\n",
(long) m->lm_msgid ));
LDAP_LOG ( CACHE, DETAIL1, "ldap_check_cache: expired id %ld\n",
(long) m->lm_msgid, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "cc: expired id %d\n",
m->lm_msgid, 0, 0 );
@ -562,9 +562,8 @@ ldap_check_cache( LDAP *ld, ber_tag_t msgtype, BerElement *request )
}
prev = new;
#ifdef NEW_LOGGING
LDAP_LOG (( "cache", LDAP_LEVEL_DETAIL1,
"ldap_check_cache: added type %ld\n",
(long) m->lm_msgtype ));
LDAP_LOG ( CACHE, DETAIL1, "ldap_check_cache: added type %ld\n",
(long) m->lm_msgtype, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "cc: added type %ld\n",
(long) new->lm_msgtype, 0, 0 );
@ -572,8 +571,8 @@ ldap_check_cache( LDAP *ld, ber_tag_t msgtype, BerElement *request )
}
#ifdef NEW_LOGGING
LDAP_LOG (( "cache", LDAP_LEVEL_RESULTS,
"ldap_check_cache: result returned from cache\n" ));
LDAP_LOG ( CACHE, RESULTS,
"ldap_check_cache: result returned from cache\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "cc: result returned from cache\n", 0, 0, 0 );
#endif
@ -603,9 +602,8 @@ cache_hash( BerElement *ber )
}
#ifdef NEW_LOGGING
LDAP_LOG (( "cache", LDAP_LEVEL_RESULTS,
"cache_hash: len is %ld, returning %ld\n",
len, len % LDAP_CACHE_BUCKETS ));
LDAP_LOG ( CACHE, RESULTS, "cache_hash: len is %ld, returning %ld\n",
len, len % LDAP_CACHE_BUCKETS, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "cache_hash: len is %ld, returning %ld\n",
len, len % LDAP_CACHE_BUCKETS, 0 );
@ -760,9 +758,9 @@ check_cache_memused( LDAPCache *lc )
LDAPMessage *m, *prev, *next;
#ifdef NEW_LOGGING
LDAP_LOG (( "cache", LDAP_LEVEL_DETAIL1,
LDAP_LOG ( CACHE, DETAIL1,
"check_cache_memused: %ld bytes in use (%ld max)\n",
lc->lc_memused, lc->lc_maxmem ));
lc->lc_memused, lc->lc_maxmem, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "check_cache_memused: %ld bytes in use (%ld max)\n",
lc->lc_memused, lc->lc_maxmem, 0 );
@ -789,9 +787,8 @@ check_cache_memused( LDAPCache *lc )
}
lc->lc_memused -= msg_size( m );
#ifdef NEW_LOGGING
LDAP_LOG (( "cache", LDAP_LEVEL_DETAIL1,
"check_cache_memused: removed %ld\n",
m->lm_msgid ));
LDAP_LOG ( CACHE, DETAIL1,
"check_cache_memused: removed %ld\n", m->lm_msgid,0,0 );
#else
Debug( LDAP_DEBUG_TRACE,
"ccm: removed %d\n",
@ -807,9 +804,9 @@ check_cache_memused( LDAPCache *lc )
}
#ifdef NEW_LOGGING
LDAP_LOG (( "cache", LDAP_LEVEL_DETAIL1,
"check_cache_memused: reduced usage to %ld bytes\n",
lc->lc_memused ));
LDAP_LOG ( CACHE, DETAIL1,
"check_cache_memused: reduced usage to %ld bytes\n",
lc->lc_memused, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ccm: reduced usage to %ld bytes\n",
lc->lc_memused, 0, 0 );

3
libraries/libldap/compare.c
View file

@ -29,6 +29,7 @@
#include <ac/time.h>
#include "ldap-int.h"
#include "ldap_log.h"
/*
* ldap_compare_ext - perform an ldap extended compare operation. The dn
@ -55,7 +56,7 @@ ldap_compare_ext(
BerElement *ber;
#ifdef NEW_LOGGING
LDAP_LOG (( "compare", LDAP_LEVEL_ENTRY, "ldap_compare\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_compare\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_compare\n", 0, 0, 0 );
#endif

26
libraries/libldap/cyrus.c
View file

@ -361,7 +361,7 @@ Sockbuf_IO ldap_pvt_sockbuf_io_sasl = {
int ldap_pvt_sasl_install( Sockbuf *sb, void *ctx_arg )
{
#ifdef NEW_LOGGING
LDAP_LOG (( "cyrus", LDAP_LEVEL_ENTRY, "ldap_pvt_sasl_install\n" ));
LDAP_LOG ( TRANSPORT, ENTRY, "ldap_pvt_sasl_install\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_pvt_sasl_install\n",
0, 0, 0 );
@ -457,8 +457,8 @@ ldap_int_sasl_open(
}
#ifdef NEW_LOGGING
LDAP_LOG (( "cyrus", LDAP_LEVEL_DETAIL1,
"ldap_int_sasl_open: host=%s\n", host ));
LDAP_LOG ( TRANSPORT, DETAIL1, "ldap_int_sasl_open: host=%s\n",
host, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_int_sasl_open: host=%s\n",
host, 0, 0 );
@ -479,8 +479,8 @@ ldap_int_sasl_open(
(void *) &extprops );
#endif
#ifdef NEW_LOGGING
LDAP_LOG (( "cyrus", LDAP_LEVEL_DETAIL1,
"ldap_int_sasl_open: ssf=%ld\n", (long) ssf ));
LDAP_LOG ( TRANSPORT, DETAIL1,
"ldap_int_sasl_open: ssf=%ld\n", (long) ssf, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_int_sasl_open: ssf=%ld\n",
(long) ssf, 0, 0 );
@ -525,8 +525,8 @@ ldap_int_sasl_bind(
ber_socket_t sd;
#ifdef NEW_LOGGING
LDAP_LOG (( "cyrus", LDAP_LEVEL_ARGS,
"ldap_int_sasl_bind: %s\n", mechs ? mechs : "<null>" ));
LDAP_LOG ( TRANSPORT, ARGS, "ldap_int_sasl_bind: %s\n",
mechs ? mechs : "<null>", 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_int_sasl_bind: %s\n",
mechs ? mechs : "<null>", 0, 0 );
@ -637,9 +637,9 @@ ldap_int_sasl_bind(
if( scred && scred->bv_len ) {
/* and server provided us with data? */
#ifdef NEW_LOGGING
LDAP_LOG (( "cyrus", LDAP_LEVEL_DETAIL1,
LDAP_LOG ( TRANSPORT, DETAIL1,
"ldap_int_sasl_bind: rc=%d sasl=%d len=%ld\n",
rc, saslrc, scred->bv_len ));
rc, saslrc, scred->bv_len );
#else
Debug( LDAP_DEBUG_TRACE,
"ldap_int_sasl_bind: rc=%d sasl=%d len=%ld\n",
@ -655,9 +655,9 @@ ldap_int_sasl_bind(
if( scred && scred->bv_len ) {
/* but server provided us with data! */
#ifdef NEW_LOGGING
LDAP_LOG (( "cyrus", LDAP_LEVEL_DETAIL1,
LDAP_LOG ( TRANSPORT, DETAIL1,
"ldap_int_sasl_bind: rc=%d sasl=%d len=%ld\n",
rc, saslrc, scred->bv_len ));
rc, saslrc, scred->bv_len );
#else
Debug( LDAP_DEBUG_TRACE,
"ldap_int_sasl_bind: rc=%d sasl=%d len=%ld\n",
@ -678,8 +678,8 @@ ldap_int_sasl_bind(
&credlen );
#ifdef NEW_LOGGING
LDAP_LOG (( "cyrus", LDAP_LEVEL_DETAIL1,
"ldap_int_sasl_bind: sasl_client_step: %d\n", saslrc ));
LDAP_LOG ( TRANSPORT, DETAIL1,
"ldap_int_sasl_bind: sasl_client_step: %d\n", saslrc,0,0 );
#else
Debug( LDAP_DEBUG_TRACE, "sasl_client_step: %d\n",
saslrc, 0, 0 );

4
libraries/libldap/delete.c
View file

@ -49,7 +49,7 @@ ldap_delete_ext(
BerElement *ber;
#ifdef NEW_LOGGING
LDAP_LOG (( "delete", LDAP_LEVEL_ENTRY, "ldap_delete_ext\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_delete_ext\n", 0,0,0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_delete_ext\n", 0, 0, 0 );
#endif
@ -139,7 +139,7 @@ ldap_delete( LDAP *ld, LDAP_CONST char *dn )
*/
#ifdef NEW_LOGGING
LDAP_LOG (( "delete", LDAP_LEVEL_ENTRY, "ldap_delete\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_delete\n", 0,0,0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_delete\n", 0, 0, 0 );
#endif

6
libraries/libldap/error.c
View file

@ -147,7 +147,7 @@ ldap_err2string( int err )
const struct ldaperror *e;
#ifdef NEW_LOGGING
LDAP_LOG (( "error", LDAP_LEVEL_ENTRY, "ldap_err2string\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_err2string\n", 0,0,0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_err2string\n", 0, 0, 0 );
#endif
@ -163,7 +163,7 @@ ldap_perror( LDAP *ld, LDAP_CONST char *str )
{
const struct ldaperror *e;
#ifdef NEW_LOGGING
LDAP_LOG (( "error", LDAP_LEVEL_ENTRY, "ldap_perror\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_perror\n", 0,0,0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_perror\n", 0, 0, 0 );
#endif
@ -243,7 +243,7 @@ ldap_parse_result(
BerElement *ber;
#ifdef NEW_LOGGING
LDAP_LOG (( "error", LDAP_LEVEL_ENTRY, "ldap_parse_result\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_parse_result\n", 0,0,0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_parse_result\n", 0, 0, 0 );
#endif

10
libraries/libldap/extended.c
View file

@ -30,6 +30,7 @@
#include <ac/time.h>
#include "ldap-int.h"
#include "ldap_log.h"
int
ldap_extended_operation(
@ -44,7 +45,7 @@ ldap_extended_operation(
int rc;
#ifdef NEW_LOGGING
LDAP_LOG (( "extended", LDAP_LEVEL_ENTRY, "ldap_extended_operation\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_extended_operation\n", 0,0,0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_extended_operation\n", 0, 0, 0 );
#endif
@ -117,7 +118,7 @@ ldap_extended_operation_s(
LDAPMessage *res;
#ifdef NEW_LOGGING
LDAP_LOG (( "extended", LDAP_LEVEL_ENTRY, "ldap_extended_operation_s\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_extended_operation_s\n", 0,0,0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_extended_operation_s\n", 0, 0, 0 );
#endif
@ -173,7 +174,7 @@ ldap_parse_extended_result (
assert( res != NULL );
#ifdef NEW_LOGGING
LDAP_LOG (( "extended", LDAP_LEVEL_ENTRY, "ldap_parse_extended_result\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_parse_extended_result\n", 0,0,0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_parse_extended_result\n", 0, 0, 0 );
#endif
@ -300,8 +301,7 @@ ldap_parse_extended_partial (
assert( res != NULL );
#ifdef NEW_LOGGING
LDAP_LOG (( "extended", LDAP_LEVEL_ENTRY,
"ldap_parse_extended_partial\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_parse_extended_partial\n", 0,0,0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_parse_extended_partial\n", 0, 0, 0 );
#endif

51
libraries/libldap/filter.c
View file

@ -357,8 +357,7 @@ ldap_pvt_put_filter( BerElement *ber, const char *str_in )
*/
#ifdef NEW_LOGGING
LDAP_LOG (( "filter", LDAP_LEVEL_ARGS, "ldap_pvt_put_filter: \"%s\"\n",
str_in ));
LDAP_LOG ( FILTER, ARGS, "ldap_pvt_put_filter: \"%s\"\n", str_in,0,0 );
#else
Debug( LDAP_DEBUG_TRACE, "put_filter: \"%s\"\n", str_in, 0, 0 );
#endif
@ -380,8 +379,7 @@ ldap_pvt_put_filter( BerElement *ber, const char *str_in )
switch ( *str ) {
case '&':
#ifdef NEW_LOGGING
LDAP_LOG (( "filter", LDAP_LEVEL_DETAIL1,
"ldap_pvt_put_filter: AND\n" ));
LDAP_LOG ( FILTER, DETAIL1, "ldap_pvt_put_filter: AND\n", 0,0,0 );
#else
Debug( LDAP_DEBUG_TRACE, "put_filter: AND\n",
0, 0, 0 );
@ -399,8 +397,7 @@ ldap_pvt_put_filter( BerElement *ber, const char *str_in )
case '|':
#ifdef NEW_LOGGING
LDAP_LOG (( "filter", LDAP_LEVEL_DETAIL1,
"ldap_pvt_put_filter: OR\n" ));
LDAP_LOG ( FILTER, DETAIL1, "ldap_pvt_put_filter: OR\n", 0,0,0 );
#else
Debug( LDAP_DEBUG_TRACE, "put_filter: OR\n",
0, 0, 0 );
@ -418,8 +415,7 @@ ldap_pvt_put_filter( BerElement *ber, const char *str_in )
case '!':
#ifdef NEW_LOGGING
LDAP_LOG (( "filter", LDAP_LEVEL_DETAIL1,
"ldap_pvt_put_filter: NOT\n" ));
LDAP_LOG ( FILTER, DETAIL1, "ldap_pvt_put_filter: NOT\n", 0,0,0 );
#else
Debug( LDAP_DEBUG_TRACE, "put_filter: NOT\n",
0, 0, 0 );
@ -437,8 +433,7 @@ ldap_pvt_put_filter( BerElement *ber, const char *str_in )
default:
#ifdef NEW_LOGGING
LDAP_LOG (( "filter", LDAP_LEVEL_DETAIL1,
"ldap_pvt_put_filter: simple\n" ));
LDAP_LOG ( FILTER, DETAIL1, "ldap_pvt_put_filter: simple\n", 0,0,0);
#else
Debug( LDAP_DEBUG_TRACE, "put_filter: simple\n",
0, 0, 0 );
@ -488,8 +483,7 @@ ldap_pvt_put_filter( BerElement *ber, const char *str_in )
case /*'('*/ ')':
#ifdef NEW_LOGGING
LDAP_LOG (( "filter", LDAP_LEVEL_DETAIL1,
"ldap_pvt_put_filter: end\n" ));
LDAP_LOG ( FILTER, DETAIL1, "ldap_pvt_put_filter: end\n", 0,0,0 );
#else
Debug( LDAP_DEBUG_TRACE, "put_filter: end\n",
0, 0, 0 );
@ -508,8 +502,7 @@ ldap_pvt_put_filter( BerElement *ber, const char *str_in )
default: /* assume it's a simple type=value filter */
#ifdef NEW_LOGGING
LDAP_LOG (( "filter", LDAP_LEVEL_DETAIL1,
"ldap_pvt_put_filter: default\n" ));
LDAP_LOG ( FILTER, DETAIL1, "ldap_pvt_put_filter: default\n", 0,0,0 );
#else
Debug( LDAP_DEBUG_TRACE, "put_filter: default\n",
0, 0, 0 );
@ -542,8 +535,7 @@ put_filter_list( BerElement *ber, char *str, ber_tag_t tag )
char save;
#ifdef NEW_LOGGING
LDAP_LOG (( "filter", LDAP_LEVEL_ARGS,
"put_filter_list \"%s\"\n", str ));
LDAP_LOG ( FILTER, ARGS, "put_filter_list \"%s\"\n", str,0,0 );
#else
Debug( LDAP_DEBUG_TRACE, "put_filter_list \"%s\"\n",
str, 0, 0 );
@ -587,8 +579,7 @@ put_simple_filter(
int rc = -1;
#ifdef NEW_LOGGING
LDAP_LOG (( "filter", LDAP_LEVEL_ARGS,
"put_simple_filter: \"%s\"\n", str ));
LDAP_LOG ( FILTER, ARGS, "put_simple_filter: \"%s\"\n", str,0,0 );
#else
Debug( LDAP_DEBUG_TRACE, "put_simple_filter: \"%s\"\n",
str, 0, 0 );
@ -759,8 +750,7 @@ put_substring_filter( BerElement *ber, char *type, char *val )
ber_tag_t ftype = LDAP_FILTER_SUBSTRINGS;
#ifdef NEW_LOGGING
LDAP_LOG (( "filter", LDAP_LEVEL_ARGS,
"put_substring_filter \"%s=%s\"\n", type, val ));
LDAP_LOG ( FILTER, ARGS, "put_substring_filter \"%s=%s\"\n", type, val, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "put_substring_filter \"%s=%s\"\n",
type, val, 0 );
@ -847,8 +837,8 @@ put_vrFilter( BerElement *ber, const char *str_in )
*/
#ifdef NEW_LOGGING
LDAP_LOG (( "filter", LDAP_LEVEL_ARGS, "put_vrFilter: \"%s\"\n",
str_in ));
LDAP_LOG ( FILTER, ARGS, "ldap_pvt_put_vrFilter: \"%s\"\n",
str_in, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "put_vrFilter: \"%s\"\n", str_in, 0, 0 );
#endif
@ -892,8 +882,8 @@ put_vrFilter( BerElement *ber, const char *str_in )
default:
#ifdef NEW_LOGGING
LDAP_LOG (( "filter", LDAP_LEVEL_DETAIL1,
"put_vrFilter: simple\n" ));
LDAP_LOG ( FILTER, DETAIL1,
"put_vrFilter: simple\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "put_vrFilter: simple\n",
0, 0, 0 );
@ -943,8 +933,7 @@ put_vrFilter( BerElement *ber, const char *str_in )
case /*'('*/ ')':
#ifdef NEW_LOGGING
LDAP_LOG (( "filter", LDAP_LEVEL_DETAIL1,
"ldap_pvt_put_filter: end\n" ));
LDAP_LOG ( FILTER, DETAIL1, "ldap_pvt_put_filter: end\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "put_filter: end\n",
0, 0, 0 );
@ -963,8 +952,8 @@ put_vrFilter( BerElement *ber, const char *str_in )
default: /* assume it's a simple type=value filter */
#ifdef NEW_LOGGING
LDAP_LOG (( "filter", LDAP_LEVEL_DETAIL1,
"ldap_pvt_put_filter: default\n" ));
LDAP_LOG ( FILTER, DETAIL1, "ldap_pvt_put_filter: default\n",
0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "put_filter: default\n",
0, 0, 0 );
@ -1011,8 +1000,7 @@ put_vrFilter_list( BerElement *ber, char *str )
char save;
#ifdef NEW_LOGGING
LDAP_LOG (( "filter", LDAP_LEVEL_ARGS,
"put_vrFilter_list \"%s\"\n", str ));
LDAP_LOG ( FILTER, ARGS, "put_vrFilter_list \"%s\"\n", str, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "put_vrFilter_list \"%s\"\n",
str, 0, 0 );
@ -1050,8 +1038,7 @@ put_simple_vrFilter(
int rc = -1;
#ifdef NEW_LOGGING
LDAP_LOG (( "filter", LDAP_LEVEL_ARGS,
"put_simple_vrFilter: \"%s\"\n", str ));
LDAP_LOG ( FILTER, ARGS, "put_simple_vrFilter: \"%s\"\n", str, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "put_simple_vrFilter: \"%s\"\n",
str, 0, 0 );

4
libraries/libldap/getattr.c
View file

@ -31,7 +31,7 @@ ldap_first_attribute( LDAP *ld, LDAPMessage *entry, BerElement **berout )
BerElement *ber;
#ifdef NEW_LOGGING
LDAP_LOG (( "getattr", LDAP_LEVEL_ENTRY, "ldap_first_attribute\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_first_attribute\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_first_attribute\n", 0, 0, 0 );
#endif
@ -97,7 +97,7 @@ ldap_next_attribute( LDAP *ld, LDAPMessage *entry, BerElement *ber )
char *attr;
#ifdef NEW_LOGGING
LDAP_LOG (( "getattr", LDAP_LEVEL_ENTRY, "ldap_next_attribute\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_next_attribute\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_next_attribute\n", 0, 0, 0 );
#endif

39
libraries/libldap/getdn.c
View file

@ -85,7 +85,7 @@ ldap_get_dn( LDAP *ld, LDAPMessage *entry )
BerElement tmp;
#ifdef NEW_LOGGING
LDAP_LOG (( "getdn", LDAP_LEVEL_ENTRY, "ldap_get_dn\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_get_dn\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_get_dn\n", 0, 0, 0 );
#endif
@ -112,7 +112,7 @@ ldap_dn2ufn( LDAP_CONST char *dn )
char *out = NULL;
#ifdef NEW_LOGGING
LDAP_LOG (( "getdn", LDAP_LEVEL_ENTRY, "ldap_dn2ufn\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_dn2ufn\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_dn2ufn\n", 0, 0, 0 );
#endif
@ -135,7 +135,7 @@ ldap_explode_dn( LDAP_CONST char *dn, int notypes )
unsigned flag = notypes ? LDAP_DN_FORMAT_UFN : LDAP_DN_FORMAT_LDAPV3;
#ifdef NEW_LOGGING
LDAP_LOG (( "getdn", LDAP_LEVEL_ENTRY, "ldap_explode_dn\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_explode_dn\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_explode_dn\n", 0, 0, 0 );
#endif
@ -179,7 +179,7 @@ ldap_explode_rdn( LDAP_CONST char *rdn, int notypes )
int iAVA;
#ifdef NEW_LOGGING
LDAP_LOG (( "getdn", LDAP_LEVEL_ENTRY, "ldap_explode_rdn\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_explode_rdn\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_explode_rdn\n", 0, 0, 0 );
#endif
@ -264,7 +264,7 @@ ldap_dn2dcedn( LDAP_CONST char *dn )
char *out = NULL;
#ifdef NEW_LOGGING
LDAP_LOG (( "getdn", LDAP_LEVEL_ENTRY, "ldap_dn2dcedn\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_dn2dcedn\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_dn2dcedn\n", 0, 0, 0 );
#endif
@ -281,7 +281,7 @@ ldap_dcedn2dn( LDAP_CONST char *dce )
char *out = NULL;
#ifdef NEW_LOGGING
LDAP_LOG (( "getdn", LDAP_LEVEL_ENTRY, "ldap_dcedn2dn\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_dcedn2dn\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_dcedn2dn\n", 0, 0, 0 );
#endif
@ -297,7 +297,7 @@ ldap_dn2ad_canonical( LDAP_CONST char *dn )
char *out = NULL;
#ifdef NEW_LOGGING
LDAP_LOG (( "getdn", LDAP_LEVEL_ENTRY, "ldap_dn2ad_canonical\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_dn2ad_canonical\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_dn2ad_canonical\n", 0, 0, 0 );
#endif
@ -333,7 +333,7 @@ ldap_dn_normalize( LDAP_CONST char *dnin,
LDAPDN *tmpDN = NULL;
#ifdef NEW_LOGGING
LDAP_LOG (( "getdn", LDAP_LEVEL_ENTRY, "ldap_dn_normalize\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_dn_normalize\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_dn_normalize\n", 0, 0, 0 );
#endif
@ -660,9 +660,8 @@ ldap_bv2dn( struct berval *bv, LDAPDN **dn, unsigned flags )
assert( dn );
#ifdef NEW_LOGGING
LDAP_LOG (( "getdn", LDAP_LEVEL_ARGS, "ldap_bv2dn(%s,%u)\n%s",
str, flags, "" ));
#elif 0
LDAP_LOG ( OPERATION, ARGS, "ldap_bv2dn(%s,%u)\n%s", str, flags, "" );
#else
Debug( LDAP_DEBUG_TRACE, "=> ldap_bv2dn(%s,%u)\n%s", str, flags, "" );
#endif
@ -837,9 +836,9 @@ return_result:;
}
#ifdef NEW_LOGGING
LDAP_LOG (( "getdn", LDAP_LEVEL_RESULTS, "<= ldap_bv2dn(%s,%u)=%d\n",
str, flags, rc ));
#elif 0
LDAP_LOG ( OPERATION, RESULTS, "<= ldap_bv2dn(%s,%u)=%d\n",
str, flags, rc );
#else
Debug( LDAP_DEBUG_TRACE, "<= ldap_bv2dn(%s,%u)=%d\n", str, flags, rc );
#endif
*dn = newDN;
@ -2967,9 +2966,9 @@ int ldap_dn2bv( LDAPDN *dn, struct berval *bv, unsigned flags )
bv->bv_val = NULL;
#ifdef NEW_LOGGING
LDAP_LOG (( "getdn", LDAP_LEVEL_ARGS, "=> ldap_dn2bv(%u)\n%s%s",
flags, "", "" ));
#elif 0
LDAP_LOG ( OPERATION, ARGS, "=> ldap_dn2bv(%u)\n%s%s",
flags, "", "" );
#else
Debug( LDAP_DEBUG_TRACE, "=> ldap_dn2bv(%u)\n%s%s", flags, "", "" );
#endif
@ -3279,9 +3278,9 @@ int ldap_dn2bv( LDAPDN *dn, struct berval *bv, unsigned flags )
}
#ifdef NEW_LOGGING
LDAP_LOG (( "getdn", LDAP_LEVEL_RESULTS, "<= ldap_dn2bv(%s,%u)=%d\n",
bv->bv_val, flags, rc ));
#elif 0
LDAP_LOG ( OPERATION, RESULTS, "<= ldap_dn2bv(%s,%u)=%d\n",
bv->bv_val, flags, rc );
#else
Debug( LDAP_DEBUG_TRACE, "<= ldap_dn2bv(%s,%u)=%d\n",
bv->bv_val, flags, rc );
#endif

6
libraries/libldap/getfilter.c
View file

@ -79,9 +79,9 @@ ldap_init_getfilter_buf( char *buf, ber_len_t buflen )
regerror(rc, &re, error, sizeof(error));
ldap_getfilter_free( lfdp );
#ifdef NEW_LOGGING
LDAP_LOG (( "getfilter", LDAP_LEVEL_ERR,
"ldap_init_get_filter_buf: bad regular expression %s, %s\n",
nextflp->lfl_pattern, error ));
LDAP_LOG ( FILTER, ERR,
"ldap_init_get_filter_buf: bad regular expression %s, %s\n",
nextflp->lfl_pattern, error, 0 );
#else
Debug( LDAP_DEBUG_ANY, "ldap_init_get_filter_buf: "
"bad regular expression %s, %s\n",

4
libraries/libldap/getvalues.c
View file

@ -37,7 +37,7 @@ ldap_get_values( LDAP *ld, LDAPMessage *entry, LDAP_CONST char *target )
assert( target != NULL );
#ifdef NEW_LOGGING
LDAP_LOG (( "getvalues", LDAP_LEVEL_ENTRY, "ldap_get_values\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_get_values\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_get_values\n", 0, 0, 0 );
#endif
@ -98,7 +98,7 @@ ldap_get_values_len( LDAP *ld, LDAPMessage *entry, LDAP_CONST char *target )
assert( target != NULL );
#ifdef NEW_LOGGING
LDAP_LOG (( "getvalues", LDAP_LEVEL_ENTRY, "ldap_get_values_len\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_get_values_len\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_get_values_len\n", 0, 0, 0 );
#endif

31
libraries/libldap/init.c
View file

@ -116,8 +116,8 @@ static void openldap_ldap_init_w_conf(
}
#ifdef NEW_LOGGING
LDAP_LOG (( "init", LDAP_LEVEL_DETAIL1,
"openldap_init_w_conf: trying %s\n", file ));
LDAP_LOG ( CONFIG, DETAIL1,
"openldap_init_w_conf: trying %s\n", file, 0, 0 );
#else
Debug(LDAP_DEBUG_TRACE, "ldap_init: trying %s\n", file, 0, 0);
#endif
@ -129,8 +129,7 @@ static void openldap_ldap_init_w_conf(
}
#ifdef NEW_LOGGING
LDAP_LOG (( "init", LDAP_LEVEL_DETAIL1,
"openldap_init_w_conf: using %s\n", file ));
LDAP_LOG ( CONFIG, DETAIL1, "openldap_init_w_conf: using %s\n", file, 0, 0 );
#else
Debug(LDAP_DEBUG_TRACE, "ldap_init: using %s\n", file, 0, 0);
#endif
@ -262,8 +261,8 @@ static void openldap_ldap_init_w_userconf(const char *file)
if (home != NULL) {
#ifdef NEW_LOGGING
LDAP_LOG (( "init", LDAP_LEVEL_ARGS,
"openldap_init_w_userconf: HOME env is %s\n", home ));
LDAP_LOG ( CONFIG, ARGS,
"openldap_init_w_userconf: HOME env is %s\n", home, 0, 0 );
#else
Debug(LDAP_DEBUG_TRACE, "ldap_init: HOME env is %s\n",
home, 0, 0);
@ -271,8 +270,8 @@ static void openldap_ldap_init_w_userconf(const char *file)
path = LDAP_MALLOC(strlen(home) + strlen(file) + 3);
} else {
#ifdef NEW_LOGGING
LDAP_LOG (( "init", LDAP_LEVEL_ARGS,
"openldap_init_w_userconf: HOME env is NULL\n" ));
LDAP_LOG ( CONFIG, ARGS, "openldap_init_w_userconf: HOME env is NULL\n",
0, 0, 0 );
#else
Debug(LDAP_DEBUG_TRACE, "ldap_init: HOME env is NULL\n",
0, 0, 0);
@ -555,9 +554,9 @@ void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl )
if( altfile != NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "init", LDAP_LEVEL_DETAIL1,
LDAP_LOG ( CONFIG, DETAIL1,
"openldap_init_w_userconf: %sCONF env is %s\n",
LDAP_ENV_PREFIX, altfile ));
LDAP_ENV_PREFIX, altfile, 0 );
#else
Debug(LDAP_DEBUG_TRACE, "ldap_init: %s env is %s\n",
LDAP_ENV_PREFIX "CONF", altfile, 0);
@ -566,9 +565,9 @@ void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl )
}
else
#ifdef NEW_LOGGING
LDAP_LOG (( "init", LDAP_LEVEL_DETAIL1,
LDAP_LOG ( CONFIG, DETAIL1,
"openldap_init_w_userconf: %sCONF env is NULL\n",
LDAP_ENV_PREFIX ));
LDAP_ENV_PREFIX, 0, 0 );
#else
Debug(LDAP_DEBUG_TRACE, "ldap_init: %s env is NULL\n",
LDAP_ENV_PREFIX "CONF", 0, 0);
@ -580,9 +579,9 @@ void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl )
if( altfile != NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "init", LDAP_LEVEL_DETAIL1,
LDAP_LOG ( CONFIG, DETAIL1,
"openldap_init_w_userconf: %sRC env is %s\n",
LDAP_ENV_PREFIX, altfile ));
LDAP_ENV_PREFIX, altfile, 0 );
#else
Debug(LDAP_DEBUG_TRACE, "ldap_init: %s env is %s\n",
LDAP_ENV_PREFIX "RC", altfile, 0);
@ -591,9 +590,9 @@ void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl )
}
else
#ifdef NEW_LOGGING
LDAP_LOG (( "init", LDAP_LEVEL_DETAIL1,
LDAP_LOG ( CONFIG, DETAIL1,
"openldap_init_w_userconf: %sRC env is NULL\n",
LDAP_ENV_PREFIX ));
LDAP_ENV_PREFIX, 0, 0 );
#else
Debug(LDAP_DEBUG_TRACE, "ldap_init: %s env is NULL\n",
LDAP_ENV_PREFIX "RC", 0, 0);

22
libraries/libldap/kbind.c
View file

@ -45,7 +45,6 @@
#include "ldap-int.h"
/*
* ldap_kerberos_bind1 - initiate a bind to the ldap server using
* kerberos authentication. The dn is supplied. It is assumed the user
@ -65,7 +64,7 @@ ldap_kerberos_bind1( LDAP *ld, LDAP_CONST char *dn )
ber_len_t credlen;
#ifdef NEW_LOGGING
LDAP_LOG (( "kbind", LDAP_LEVEL_ENTRY, "ldap_kerberos_bind1\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_kerberos_bind1\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_kerberos_bind1\n", 0, 0, 0 );
#endif
@ -119,7 +118,7 @@ ldap_kerberos_bind1_s( LDAP *ld, LDAP_CONST char *dn )
LDAPMessage *res;
#ifdef NEW_LOGGING
LDAP_LOG (( "kbind", LDAP_LEVEL_ENTRY, "ldap_kerberos_bind1_s\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_kerberos_bind1_s\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_kerberos_bind1_s\n", 0, 0, 0 );
#endif
@ -156,7 +155,7 @@ ldap_kerberos_bind2( LDAP *ld, LDAP_CONST char *dn )
ber_len_t credlen;
#ifdef NEW_LOGGING
LDAP_LOG (( "kbind", LDAP_LEVEL_ENTRY, "ldap_kerberos_bind2\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_kerberos_bind2\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_kerberos_bind2\n", 0, 0, 0 );
#endif
@ -205,7 +204,7 @@ ldap_kerberos_bind2_s( LDAP *ld, LDAP_CONST char *dn )
LDAPMessage *res;
#ifdef NEW_LOGGING
LDAP_LOG (( "kbind", LDAP_LEVEL_ENTRY, "ldap_kerberos_bind2_s\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_kerberos_bind2_s\n" , 0, 0, 0);
#else
Debug( LDAP_DEBUG_TRACE, "ldap_kerberos_bind2_s\n", 0, 0, 0 );
#endif
@ -230,7 +229,7 @@ ldap_kerberos_bind_s( LDAP *ld, LDAP_CONST char *dn )
int err;
#ifdef NEW_LOGGING
LDAP_LOG (( "kbind", LDAP_LEVEL_ENTRY, "ldap_kerberos_bind_s\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_kerberos_bind_s\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_kerberos_bind_s\n", 0, 0, 0 );
#endif
@ -261,17 +260,16 @@ ldap_get_kerberosv4_credentials(
char realm[REALM_SZ], *cred, *krbinstance;
#ifdef NEW_LOGGING
LDAP_LOG (( "kbind", LDAP_LEVEL_ENTRY,
"ldap_get_kerberosv4_credentials\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_get_kerberosv4_credentials\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_get_kerberosv4_credentials\n", 0, 0, 0 );
#endif
if ( (err = krb_get_tf_realm( tkt_string(), realm )) != KSUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "kbind", LDAP_LEVEL_ERR,
LDAP_LOG ( OPERATION, ERR,
"ldap_get_kerberosv4_credentials: krb_get_tf_realm failed: %s\n",
krb_err_txt[err] ));
krb_err_txt[err], 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "ldap_get_kerberosv4_credentials: "
"krb_get_tf_realm failed: %s\n", krb_err_txt[err], 0, 0 );
@ -293,9 +291,9 @@ ldap_get_kerberosv4_credentials(
!= KSUCCESS )
{
#ifdef NEW_LOGGING
LDAP_LOG (( "kbind", LDAP_LEVEL_ERR,
LDAP_LOG ( OPERATION, ERR,
"ldap_get_kerberosv4_credentials: krb_mk_req failed: %s\n",
krb_err_txt[err] ));
krb_err_txt[err], 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "ldap_get_kerberosv4_credentials: "
"krb_mk_req failed (%s)\n", krb_err_txt[err], 0, 0 );

4
libraries/libldap/modify.c
View file

@ -72,7 +72,7 @@ ldap_modify_ext( LDAP *ld,
*/
#ifdef NEW_LOGGING
LDAP_LOG (( "modify", LDAP_LEVEL_ENTRY, "ldap_modify_ext\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_modify_ext\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_modify_ext\n", 0, 0, 0 );
#endif
@ -160,7 +160,7 @@ ldap_modify( LDAP *ld, LDAP_CONST char *dn, LDAPMod **mods )
int rc, msgid;
#ifdef NEW_LOGGING
LDAP_LOG (( "modify", LDAP_LEVEL_ENTRY, "ldap_modify\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_modify\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_modify\n", 0, 0, 0 );
#endif

4
libraries/libldap/modrdn.c
View file

@ -69,7 +69,7 @@ ldap_rename(
int rc;
#ifdef NEW_LOGGING
LDAP_LOG (( "modrdn", LDAP_LEVEL_ENTRY, "ldap_rename\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_rename\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_rename\n", 0, 0, 0 );
#endif
@ -156,7 +156,7 @@ ldap_rename2(
int rc;
#ifdef NEW_LOGGING
LDAP_LOG (( "modrdn", LDAP_LEVEL_ENTRY, "ldap_rename2\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_rename2\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_rename2\n", 0, 0, 0 );
#endif

12
libraries/libldap/open.c
View file

@ -23,6 +23,7 @@
#include <ac/time.h>
#include "ldap-int.h"
#include "ldap_log.h"
int ldap_open_defconn( LDAP *ld )
{
@ -55,8 +56,7 @@ ldap_open( LDAP_CONST char *host, int port )
LDAP *ld;
#ifdef NEW_LOGGING
LDAP_LOG (( "open", LDAP_LEVEL_ARGS, "ldap_open(%s, %d)\n",
host, port ));
LDAP_LOG ( CONNECTION, ARGS, "ldap_open(%s, %d)\n", host, port, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_open(%s, %d)\n",
host, port, 0 );
@ -75,8 +75,8 @@ ldap_open( LDAP_CONST char *host, int port )
}
#ifdef NEW_LOGGING
LDAP_LOG (( "open", LDAP_LEVEL_RESULTS, "ldap_open: %s\n",
ld == NULL ? "succeeded" : "failed" ));
LDAP_LOG ( CONNECTION, RESULTS, "ldap_open: %s\n",
ld == NULL ? "succeeded" : "failed", 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_open: %s\n",
ld == NULL ? "succeeded" : "failed", 0, 0 );
@ -107,7 +107,7 @@ ldap_create( LDAP **ldp )
}
#ifdef NEW_LOGGING
LDAP_LOG (( "open", LDAP_LEVEL_ENTRY, "ldap_create\n" ));
LDAP_LOG ( CONNECTION, ENTRY, "ldap_create\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_create\n", 0, 0, 0 );
#endif
@ -240,7 +240,7 @@ ldap_int_open_connection(
long addr;
#ifdef NEW_LOGGING
LDAP_LOG (( "open", LDAP_LEVEL_ENTRY, "ldap_int_open_connection\n" ));
LDAP_LOG ( CONNECTION, ENTRY, "ldap_int_open_connection\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_int_open_connection\n", 0, 0, 0 );
#endif

2
libraries/libldap/os-ip.c
View file

@ -686,7 +686,7 @@ ldap_int_select( LDAP *ld, struct timeval *timeout )
struct selectinfo *sip;
#ifdef NEW_LOGGING
LDAP_LOG (( "os-ip", LDAP_LEVEL_ENTRY, "ldap_int_select\n" ));
LDAP_LOG ( CONNECTION, ENTRY, "ldap_int_select\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_int_select\n", 0, 0, 0 );
#endif

80
libraries/libldap/request.c
View file

@ -84,7 +84,7 @@ ldap_send_initial_request(
int rc;
#ifdef NEW_LOGGING
LDAP_LOG (( "request", LDAP_LEVEL_ENTRY, "ldap_send_initial_request\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_send_initial_request\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_send_initial_request\n", 0, 0, 0 );
#endif
@ -99,8 +99,9 @@ ldap_send_initial_request(
}
#ifdef NEW_LOGGING
LDAP_LOG (( "request", LDAP_LEVEL_DETAIL1,
"ldap_send_initial_request: ldap_open_defconn: successful\n" ));
LDAP_LOG ( OPERATION, DETAIL1,
"ldap_send_initial_request: ldap_open_defconn: successful\n" ,
0, 0, 0);
#else
Debug( LDAP_DEBUG_TRACE,
"ldap_open_defconn: successful\n",
@ -151,7 +152,7 @@ ldap_send_server_request(
int incparent;
#ifdef NEW_LOGGING
LDAP_LOG (( "request", LDAP_LEVEL_ENTRY, "ldap_send_server_request\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_send_server_request\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_send_server_request\n", 0, 0, 0 );
#endif
@ -263,7 +264,7 @@ ldap_new_connection( LDAP *ld, LDAPURLDesc *srvlist, int use_ldsb,
Sockbuf *sb = NULL;
#ifdef NEW_LOGGING
LDAP_LOG (( "request", LDAP_LEVEL_ENTRY, "ldap_new_connection\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_new_connection\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_new_connection\n", 0, 0, 0 );
#endif
@ -329,8 +330,9 @@ ldap_new_connection( LDAP *ld, LDAPURLDesc *srvlist, int use_ldsb,
ld->ld_defconn = lc;
#ifdef NEW_LOGGING
LDAP_LOG (( "request", LDAP_LEVEL_DETAIL1,
"ldap_new_connection: Call application rebind_proc\n" ));
LDAP_LOG ( OPERATION, DETAIL1,
"ldap_new_connection: Call application rebind_proc\n",
0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "Call application rebind_proc\n", 0, 0, 0);
#endif
@ -354,8 +356,9 @@ ldap_new_connection( LDAP *ld, LDAPURLDesc *srvlist, int use_ldsb,
ld->ld_defconn = lc;
#ifdef NEW_LOGGING
LDAP_LOG (( "request", LDAP_LEVEL_DETAIL1,
"ldap_new_connection: anonymous rebind via ldap_bind_s\n" ));
LDAP_LOG ( OPERATION, DETAIL1,
"ldap_new_connection: anonymous rebind via ldap_bind_s\n",
0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "anonymous rebind via ldap_bind_s\n", 0, 0, 0);
#endif
@ -422,7 +425,7 @@ ldap_free_connection( LDAP *ld, LDAPConn *lc, int force, int unbind )
LDAPConn *tmplc, *prevlc;
#ifdef NEW_LOGGING
LDAP_LOG (( "request", LDAP_LEVEL_ENTRY, "ldap_free_connection\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_free_connection\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_free_connection\n", 0, 0, 0 );
#endif
@ -472,8 +475,8 @@ ldap_free_connection( LDAP *ld, LDAPConn *lc, int force, int unbind )
}
LDAP_FREE( lc );
#ifdef NEW_LOGGING
LDAP_LOG (( "request", LDAP_LEVEL_RESULTS,
"ldap_free_connection: actually freed\n" ));
LDAP_LOG ( OPERATION, RESULTS,
"ldap_free_connection: actually freed\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_free_connection: actually freed\n",
0, 0, 0 );
@ -481,8 +484,8 @@ ldap_free_connection( LDAP *ld, LDAPConn *lc, int force, int unbind )
} else {
lc->lconn_lastused = time( NULL );
#ifdef NEW_LOGGING
LDAP_LOG (( "request", LDAP_LEVEL_RESULTS,
"ldap_free_connection: refcnt %d\n", lc->lconn_refcnt ));
LDAP_LOG ( OPERATION, RESULTS, "ldap_free_connection: refcnt %d\n",
lc->lconn_refcnt, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_free_connection: refcnt %d\n",
lc->lconn_refcnt, 0, 0 );
@ -612,9 +615,8 @@ ldap_free_request( LDAP *ld, LDAPRequest *lr )
LDAPRequest **ttmplr;
#ifdef NEW_LOGGING
LDAP_LOG (( "request", LDAP_LEVEL_ARGS,
"ldap_free_request (origid %d, msgid %d)\n",
lr->lr_origid, lr->lr_msgid ));
LDAP_LOG ( OPERATION, ARGS, "ldap_free_request (origid %d, msgid %d)\n",
lr->lr_origid, lr->lr_msgid, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_free_request (origid %d, msgid %d)\n",
lr->lr_origid, lr->lr_msgid, 0 );
@ -665,7 +667,7 @@ ldap_chase_v3referrals( LDAP *ld, LDAPRequest *lr, char **refs, int sref, char *
*hadrefp = 0;
#ifdef NEW_LOGGING
LDAP_LOG (( "request", LDAP_LEVEL_ENTRY, "ldap_chase_v3referrals\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_chase_v3referrals\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_chase_v3referrals\n", 0, 0, 0 );
#endif
@ -682,9 +684,9 @@ ldap_chase_v3referrals( LDAP *ld, LDAPRequest *lr, char **refs, int sref, char *
/* Check for hop limit exceeded */
if ( lr->lr_parentcnt >= ld->ld_refhoplimit ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "request", LDAP_LEVEL_DETAIL1,
LDAP_LOG ( OPERATION, DETAIL1,
"ldap_chase_v3referrals: more than %d referral hops (dropping)\n",
ld->ld_refhoplimit ));
ld->ld_refhoplimit, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"more than %d referral hops (dropping)\n", ld->ld_refhoplimit, 0, 0 );
@ -737,9 +739,9 @@ ldap_chase_v3referrals( LDAP *ld, LDAPRequest *lr, char **refs, int sref, char *
* for the same server with different contexts.
*/
#ifdef NEW_LOGGING
LDAP_LOG (( "request", LDAP_LEVEL_DETAIL1,
LDAP_LOG ( OPERATION, DETAIL1,
"ldap_chase_v3referrals: queue referral \"%s\"\n",
refarray[i] ));
refarray[i], 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"ldap_chase_v3referrals: queue referral \"%s\"\n",
@ -807,9 +809,9 @@ ldap_chase_v3referrals( LDAP *ld, LDAPRequest *lr, char **refs, int sref, char *
}
#ifdef NEW_LOGGING
LDAP_LOG (( "request", LDAP_LEVEL_DETAIL1,
LDAP_LOG ( OPERATION, DETAIL1,
"ldap_chase_v3referrals: msgid %d, url \"%s\"\n",
lr->lr_msgid, refarray[i] ));
lr->lr_msgid, refarray[i], 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"ldap_chase_v3referral: msgid %d, url \"%s\"\n",
@ -823,9 +825,9 @@ ldap_chase_v3referrals( LDAP *ld, LDAPRequest *lr, char **refs, int sref, char *
origreq, srv, NULL, &rinfo )) < 0 ) {
/* Failure, try next referral in the list */
#ifdef NEW_LOGGING
LDAP_LOG (( "request", LDAP_LEVEL_ERR,
LDAP_LOG ( OPERATION, ERR,
"ldap_chase_v3referrals: Unable to chase referral \"%s\" (%s)\n",
refarray[i], ldap_err2string( ld->ld_errno ) ));
refarray[i], ldap_err2string( ld->ld_errno ), 0 );
#else
Debug( LDAP_DEBUG_ANY, "Unable to chase referral \"%s\" (%s)\n",
refarray[i], ldap_err2string( ld->ld_errno ), 0);
@ -908,7 +910,7 @@ ldap_chase_referrals( LDAP *ld,
LDAPreqinfo rinfo;
#ifdef NEW_LOGGING
LDAP_LOG (( "request", LDAP_LEVEL_ENTRY, "ldap_chase_referrals\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_chase_referrals\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_chase_referrals\n", 0, 0, 0 );
#endif
@ -935,9 +937,9 @@ ldap_chase_referrals( LDAP *ld,
if ( lr->lr_parentcnt >= ld->ld_refhoplimit ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "request", LDAP_LEVEL_ENTRY,
LDAP_LOG ( OPERATION, ENTRY,
"ldap_chase_referrals: more than %d referral hops (dropping)\n",
ld->ld_refhoplimit ));
ld->ld_refhoplimit, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"more than %d referral hops (dropping)\n",
@ -968,9 +970,9 @@ ldap_chase_referrals( LDAP *ld,
if ( rc != LDAP_URL_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "request", LDAP_LEVEL_DETAIL1,
LDAP_LOG ( OPERATION, DETAIL1,
"ldap_chase_referrals: ignoring unknown referral <%s>\n",
ref ));
ref, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"ignoring unknown referral <%s>\n", ref, 0, 0 );
@ -986,8 +988,8 @@ ldap_chase_referrals( LDAP *ld,
}
#ifdef NEW_LOGGING
LDAP_LOG (( "request", LDAP_LEVEL_DETAIL1,
"ldap_chase_referrals: chasing LDAP referral <%s>\n", ref ));
LDAP_LOG ( OPERATION, DETAIL1,
"ldap_chase_referrals: chasing LDAP referral <%s>\n", ref, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"chasing LDAP referral: <%s>\n", ref, 0, 0 );
@ -1016,9 +1018,9 @@ ldap_chase_referrals( LDAP *ld,
++count;
} else {
#ifdef NEW_LOGGING
LDAP_LOG (( "request", LDAP_LEVEL_ERR,
LDAP_LOG ( OPERATION, ERR,
"ldap_chase_referrals: Unable to chase referral <%s>\n",
ldap_err2string( ld->ld_errno) ));
ldap_err2string( ld->ld_errno), 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"Unable to chase referral (%s)\n",
@ -1091,10 +1093,10 @@ re_encode_request( LDAP *ld,
char *dn;
#ifdef NEW_LOGGING
LDAP_LOG (( "request", LDAP_LEVEL_ARGS,
LDAP_LOG ( OPERATION, ARGS,
"re_encode_request: new msgid %ld, new dn <%s>\n",
(long) msgid,
( srv == NULL || srv->lud_dn == NULL ) ? "NONE" : srv->lud_dn ));
( srv == NULL || srv->lud_dn == NULL ) ? "NONE" : srv->lud_dn, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"re_encode_request: new msgid %ld, new dn <%s>\n",
@ -1192,8 +1194,8 @@ re_encode_request( LDAP *ld,
#ifdef LDAP_DEBUG
if ( ldap_debug & LDAP_DEBUG_PACKETS ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "request", LDAP_LEVEL_DETAIL1,
"re_encode_request: new request is:\n" ));
LDAP_LOG ( OPERATION, DETAIL1,
"re_encode_request: new request is:\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "re_encode_request new request is:\n",
0, 0, 0 );

113
libraries/libldap/result.c
View file

@ -53,7 +53,7 @@
#include <ac/unistd.h>
#include "ldap-int.h"
#include "ldap_log.h"
static int ldap_abandoned LDAP_P(( LDAP *ld, ber_int_t msgid ));
static int ldap_mark_abandoned LDAP_P(( LDAP *ld, ber_int_t msgid ));
@ -98,7 +98,7 @@ ldap_result(
assert( result != NULL );
#ifdef NEW_LOGGING
LDAP_LOG (( "result", LDAP_LEVEL_ARGS, "ldap_result msgid %d\n", msgid ));
LDAP_LOG ( OPERATION, ARGS, "ldap_result msgid %d\n", msgid, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_result msgid %d\n", msgid, 0, 0 );
#endif
@ -129,8 +129,8 @@ chkResponseList(
*/
#ifdef NEW_LOGGING
LDAP_LOG (( "result", LDAP_LEVEL_ARGS,
"ldap_chkResponseList for msgid=%d, all=%d\n", msgid, all ));
LDAP_LOG ( OPERATION, ARGS, "ldap_chkResponseList for msgid=%d, all=%d\n",
msgid, all, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"ldap_chkResponseList for msgid=%d, all=%d\n",
@ -142,8 +142,8 @@ chkResponseList(
if ( ldap_abandoned( ld, lm->lm_msgid ) ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "result", LDAP_LEVEL_DETAIL1,
"ldap_chkResponseList msg abandoned, msgid %d\n", msgid ));
LDAP_LOG ( OPERATION, DETAIL1,
"ldap_chkResponseList msg abandoned, msgid %d\n", msgid, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"ldap_chkResponseList msg abandoned, msgid %d\n",
@ -207,17 +207,17 @@ chkResponseList(
#ifdef LDAP_DEBUG
if( lm == NULL) {
#ifdef NEW_LOGGING
LDAP_LOG (( "result", LDAP_LEVEL_RESULTS,
"ldap_chkResponseList returns NULL\n" ));
LDAP_LOG ( OPERATION, RESULTS, "ldap_chkResponseList returns NULL\n",
0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"ldap_chkResponseList returns NULL\n", 0, 0, 0);
#endif
} else {
#ifdef NEW_LOGGING
LDAP_LOG (( "result", LDAP_LEVEL_RESULTS,
"ldap_chkResponseList returns msgid %d, type 0x02lu\n",
lm->lm_msgid, (unsigned long) lm->lm_msgtype ));
LDAP_LOG ( OPERATION, RESULTS,
"ldap_chkResponseList returns msgid %d, type 0x%02lu\n",
lm->lm_msgid, (unsigned long) lm->lm_msgtype, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"ldap_chkResponseList returns msgid %d, type 0x%02lu\n",
@ -248,17 +248,17 @@ wait4msg(
#ifdef LDAP_DEBUG
if ( timeout == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "result", LDAP_LEVEL_ARGS,
"wait4msg (infinite timeout), msgid %d\n", msgid ));
LDAP_LOG ( OPERATION, ARGS,
"wait4msg (infinite timeout), msgid %d\n", msgid, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "wait4msg (infinite timeout), msgid %d\n",
msgid, 0, 0 );
#endif
} else {
#ifdef NEW_LOGGING
LDAP_LOG (( "result", LDAP_LEVEL_ARGS,
LDAP_LOG ( OPERATION, ARGS,
"wait4msg (timeout %ld sec, %ld usec), msgid %d\n",
(long) timeout->tv_sec, (long) timeout->tv_usec, msgid ));
(long) timeout->tv_sec, (long) timeout->tv_usec, msgid );
#else
Debug( LDAP_DEBUG_TRACE, "wait4msg (timeout %ld sec, %ld usec), msgid %d\n",
(long) timeout->tv_sec, (long) timeout->tv_usec, msgid );
@ -278,8 +278,8 @@ wait4msg(
while ( rc == -2 ) {
#ifdef LDAP_DEBUG
#ifdef NEW_LOGGING
LDAP_LOG (( "result", LDAP_LEVEL_ARGS,
"wait4msg continue, msgid %d, all %d\n", msgid, all ));
LDAP_LOG ( OPERATION, ARGS,
"wait4msg continue, msgid %d, all %d\n", msgid, all, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "wait4msg continue, msgid %d, all %d\n",
msgid, all, 0 );
@ -310,9 +310,9 @@ wait4msg(
#ifdef LDAP_DEBUG
if ( rc == -1 ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "result", LDAP_LEVEL_ARGS,
LDAP_LOG ( OPERATION, ARGS,
"wait4msg: ldap_int_select returned -1: errno %d\n",
errno ));
errno, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"ldap_int_select returned -1: errno %d\n",
@ -358,8 +358,8 @@ wait4msg(
}
#ifdef NEW_LOGGING
LDAP_LOG (( "result", LDAP_LEVEL_DETAIL1,
"wait4msg: %ld secs to go\n", (long) tv.tv_sec ));
LDAP_LOG ( OPERATION, DETAIL1,
"wait4msg: %ld secs to go\n", (long) tv.tv_sec, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "wait4msg: %ld secs to go\n",
(long) tv.tv_sec, 0, 0 );
@ -401,8 +401,7 @@ try_read1msg(
assert( lc != NULL );
#ifdef NEW_LOGGING
LDAP_LOG (( "result", LDAP_LEVEL_ARGS, "read1msg: msgid %d, all %d\n",
msgid, all ));
LDAP_LOG ( OPERATION, ARGS, "read1msg: msgid %d, all %d\n", msgid, all, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "read1msg: msgid %d, all %d\n", msgid, all, 0 );
#endif
@ -431,8 +430,8 @@ try_read1msg(
if ( tag == LBER_DEFAULT) {
#ifdef LDAP_DEBUG
#ifdef NEW_LOGGING
LDAP_LOG (( "result", LDAP_LEVEL_DETAIL1,
"read1msg: ber_get_next failed\n" ));
LDAP_LOG ( OPERATION, DETAIL1,
"read1msg: ber_get_next failed\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_CONNS,
"ber_get_next failed.\n", 0, 0, 0 );
@ -468,8 +467,7 @@ try_read1msg(
if ( ldap_abandoned( ld, id ) ) {
ber_free( ber, 1 );
#ifdef NEW_LOGGING
LDAP_LOG (( "result", LDAP_LEVEL_DETAIL1,
"read1msg: abandoned\n" ));
LDAP_LOG ( OPERATION, DETAIL1, "read1msg: abandoned\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "abandoned\n", 0, 0, 0);
#endif
@ -478,9 +476,9 @@ try_read1msg(
if (( lr = ldap_find_request_by_msgid( ld, id )) == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "result", LDAP_LEVEL_DETAIL1,
LDAP_LOG ( OPERATION, DETAIL1,
"read1msg: no request for response with msgid %ld (tossing)\n",
(long) id ));
(long) id, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"no request for response with msgid %ld (tossing)\n",
@ -503,10 +501,10 @@ try_read1msg(
}
#ifdef NEW_LOGGING
LDAP_LOG (( "result", LDAP_LEVEL_DETAIL1,
LDAP_LOG ( OPERATION, DETAIL1,
"read1msg: ldap_read: message type %s msgid %ld, original id %ld\n",
ldap_int_msgtype2str( tag ),
(long) lr->lr_msgid, (long) lr->lr_origid ));
(long) lr->lr_msgid, (long) lr->lr_origid );
#else
Debug( LDAP_DEBUG_TRACE,
"ldap_read: message type %s msgid %ld, original id %ld\n",
@ -548,10 +546,10 @@ try_read1msg(
if( lr->lr_status != LDAP_REQST_COMPLETED) {
lr->lr_status = LDAP_REQST_CHASINGREFS;
#ifdef NEW_LOGGING
LDAP_LOG (( "result", LDAP_LEVEL_DETAIL1,
LDAP_LOG ( OPERATION, DETAIL1,
"read1msg: search ref chased,"
"mark request chasing refs, id = %d\n",
lr->lr_msgid ));
lr->lr_msgid, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"read1msg: search ref chased, mark request chasing refs, id = %d\n",
@ -581,10 +579,10 @@ try_read1msg(
rc = LDAP_DECODING_ERROR;
lr->lr_status = LDAP_REQST_COMPLETED;
#ifdef NEW_LOGGING
LDAP_LOG (( "result", LDAP_LEVEL_DETAIL1,
LDAP_LOG ( OPERATION, DETAIL1,
"read1msg: referral decode error,"
"mark request completed, id = %d\n",
lr->lr_msgid ));
lr->lr_msgid, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"read1msg: referral decode error, mark request completed, id = %d\n",
@ -598,10 +596,10 @@ try_read1msg(
0, &lr->lr_res_error, &hadref );
lr->lr_status = LDAP_REQST_COMPLETED;
#ifdef NEW_LOGGING
LDAP_LOG (( "result", LDAP_LEVEL_DETAIL1,
LDAP_LOG ( OPERATION, DETAIL1,
"read1msg: referral chased,"
"mark request completed, id = %d\n",
lr->lr_msgid ));
lr->lr_msgid, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"read1msg: referral chased, mark request completed, id = %d\n",
@ -654,10 +652,10 @@ try_read1msg(
&lr->lr_res_error, -1, &hadref );
lr->lr_status = LDAP_REQST_COMPLETED;
#ifdef NEW_LOGGING
LDAP_LOG (( "result", LDAP_LEVEL_DETAIL1,
LDAP_LOG ( OPERATION, DETAIL1,
"read1msg: V2 referral chased,"
"mark request completed, id = %d\n",
lr->lr_msgid ));
lr->lr_msgid, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"read1msg: V2 referral chased, mark request completed, id = %d\n", lr->lr_msgid, 0, 0);
@ -675,10 +673,10 @@ try_read1msg(
lr->lr_res_errno = LDAP_PARTIAL_RESULTS;
}
#ifdef NEW_LOGGING
LDAP_LOG (( "result", LDAP_LEVEL_DETAIL1,
LDAP_LOG ( OPERATION, DETAIL1,
"read1msg: new result: res_errno: %d, res_error: <%s>, res_matched: <%s>\n",
lr->lr_res_errno, lr->lr_res_error ? lr->lr_res_error : "",
lr->lr_res_matched ? lr->lr_res_matched : "" ));
lr->lr_res_matched ? lr->lr_res_matched : "" );
#else
Debug( LDAP_DEBUG_TRACE,
"new result: res_errno: %d, res_error: <%s>, res_matched: <%s>\n",
@ -689,8 +687,8 @@ Debug( LDAP_DEBUG_TRACE,
}
#ifdef NEW_LOGGING
LDAP_LOG (( "result", LDAP_LEVEL_DETAIL1,
"read1msg: %d new referrals\n", refer_cnt ));
LDAP_LOG ( OPERATION, DETAIL1, "read1msg: %d new referrals\n",
refer_cnt, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"read1msg: %d new referrals\n", refer_cnt, 0, 0 );
@ -715,8 +713,9 @@ Debug( LDAP_DEBUG_TRACE,
lr->lr_status = LDAP_REQST_COMPLETED; /* declare this request done */
#ifdef NEW_LOGGING
LDAP_LOG (( "result", LDAP_LEVEL_DETAIL1,
"read1msg: mark request completed, id = %d\n", lr->lr_msgid ));
LDAP_LOG ( OPERATION, DETAIL1,
"read1msg: mark request completed, id = %d\n",
lr->lr_msgid, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"read1msg: mark request completed, id = %d\n", lr->lr_msgid, 0, 0);
@ -745,12 +744,12 @@ Debug( LDAP_DEBUG_TRACE,
id = lr->lr_msgid;
tag = lr->lr_res_msgtype;
#ifdef NEW_LOGGING
LDAP_LOG (( "result", LDAP_LEVEL_DETAIL1,
"read1msg: request %ld done\n", (long) id ));
LDAP_LOG (( "result", LDAP_LEVEL_DETAIL1,
LDAP_LOG ( OPERATION, DETAIL1,
"read1msg: request %ld done\n", (long) id, 0, 0 );
LDAP_LOG ( OPERATION, DETAIL1,
"read1msg: res_errno: %d,res_error: <%s>, res_matched: <%s>\n",
lr->lr_res_errno, lr->lr_res_error ? lr->lr_res_error : "",
lr->lr_res_matched ? lr->lr_res_matched : "" ));
lr->lr_res_matched ? lr->lr_res_matched : "" );
#else
Debug( LDAP_DEBUG_ANY, "request %ld done\n",
(long) id, 0, 0 );
@ -838,9 +837,9 @@ lr->lr_res_matched ? lr->lr_res_matched : "" );
}
#ifdef NEW_LOGGING
LDAP_LOG (( "result", LDAP_LEVEL_DETAIL1,
LDAP_LOG ( OPERATION, DETAIL1,
"read1msg: adding response id %ld type %ld\n",
(long) new->lm_msgid, (long) new->lm_msgtype ));
(long) new->lm_msgid, (long) new->lm_msgtype, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "adding response id %ld type %ld:\n",
(long) new->lm_msgid, (long) new->lm_msgtype, 0 );
@ -964,12 +963,12 @@ merge_error_info( LDAP *ld, LDAPRequest *parentr, LDAPRequest *lr )
}
#ifdef NEW_LOGGING
LDAP_LOG (( "result", LDAP_LEVEL_DETAIL1,
"read1msg: merged parent (id %d) error info: result errno %d, "
"error <%s>, matched <%s>\n", parentr->lr_msgid,
LDAP_LOG( OPERATION, DETAIL1, "merged parent (id %d) error info: ",
parentr->lr_msgid, 0, 0 );
LDAP_LOG( OPERATION, DETAIL1, "result errno %d, error <%s>, matched <%s>\n",
parentr->lr_res_errno, parentr->lr_res_error ?
parentr->lr_res_error : "", parentr->lr_res_matched ?
parentr->lr_res_matched : "" ));
parentr->lr_res_matched : "" );
#else
Debug( LDAP_DEBUG_TRACE, "merged parent (id %d) error info: ",
parentr->lr_msgid, 0, 0 );
@ -1024,7 +1023,7 @@ ldap_msgfree( LDAPMessage *lm )
int type = 0;
#ifdef NEW_LOGGING
LDAP_LOG (( "result", LDAP_LEVEL_ENTRY, "ldap_msgfree\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_msgfree\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_msgfree\n", 0, 0, 0 );
#endif
@ -1052,7 +1051,7 @@ ldap_msgdelete( LDAP *ld, int msgid )
assert( ld != NULL );
#ifdef NEW_LOGGING
LDAP_LOG (( "result", LDAP_LEVEL_ENTRY, "ldap_msgdelete\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_msgdelete\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_msgdelete\n", 0, 0, 0 );
#endif

17
libraries/libldap/sasl.c
View file

@ -62,7 +62,7 @@ ldap_sasl_bind(
int rc;
#ifdef NEW_LOGGING
LDAP_LOG (( "sasl", LDAP_LEVEL_ENTRY, "ldap_sasl_bind\n" ));
LDAP_LOG ( TRANSPORT, ENTRY, "ldap_sasl_bind\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_sasl_bind\n", 0, 0, 0 );
#endif
@ -169,7 +169,7 @@ ldap_sasl_bind_s(
struct berval *scredp = NULL;
#ifdef NEW_LOGGING
LDAP_LOG (( "sasl", LDAP_LEVEL_ENTRY, "ldap_sasl_bind_s\n" ));
LDAP_LOG ( TRANSPORT, ENTRY, "ldap_sasl_bind_s\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_sasl_bind_s\n", 0, 0, 0 );
#endif
@ -255,7 +255,7 @@ ldap_parse_sasl_bind_result(
BerElement *ber;
#ifdef NEW_LOGGING
LDAP_LOG (( "sasl", LDAP_LEVEL_ENTRY, "ldap_parse_sasl_bind_result\n" ));
LDAP_LOG ( TRANSPORT, ENTRY, "ldap_parse_sasl_bind_result\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_parse_sasl_bind_result\n", 0, 0, 0 );
#endif
@ -368,7 +368,7 @@ ldap_pvt_sasl_getmechs ( LDAP *ld, char **pmechlist )
int rc;
#ifdef NEW_LOGGING
LDAP_LOG (( "sasl", LDAP_LEVEL_ENTRY, "ldap_pvt_sasl_getmech\n" ));
LDAP_LOG ( TRANSPORT, ENTRY, "ldap_pvt_sasl_getmech\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_pvt_sasl_getmech\n", 0, 0, 0 );
#endif
@ -456,8 +456,9 @@ ldap_sasl_interactive_bind_s(
}
#ifdef NEW_LOGGING
LDAP_LOG (( "sasl", LDAP_LEVEL_DETAIL1,
"ldap_interactive_sasl_bind_s: server supports: %s\n", smechs ));
LDAP_LOG ( TRANSPORT, DETAIL1,
"ldap_interactive_sasl_bind_s: server supports: %s\n",
smechs, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"ldap_interactive_sasl_bind_s: server supports: %s\n",
@ -468,8 +469,8 @@ ldap_sasl_interactive_bind_s(
} else {
#ifdef NEW_LOGGING
LDAP_LOG (( "sasl", LDAP_LEVEL_DETAIL1,
"ldap_interactive_sasl_bind_s: user selected: %s\n", mechs ));
LDAP_LOG ( TRANSPORT, DETAIL1,
"ldap_interactive_sasl_bind_s: user selected: %s\n", mechs, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"ldap_interactive_sasl_bind_s: user selected: %s\n",

5
libraries/libldap/sbind.c
View file

@ -41,7 +41,6 @@
#include "ldap-int.h"
/*
* ldap_simple_bind - bind to the ldap server (and X.500). The dn and
* password of the entry to which to bind are supplied. The message id
@ -63,7 +62,7 @@ ldap_simple_bind(
struct berval cred;
#ifdef NEW_LOGGING
LDAP_LOG (( "sbind", LDAP_LEVEL_ENTRY, "ldap_simple_bind\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_simple_bind\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_simple_bind\n", 0, 0, 0 );
#endif
@ -102,7 +101,7 @@ ldap_simple_bind_s( LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *passwd )
struct berval cred;
#ifdef NEW_LOGGING
LDAP_LOG (( "sbind", LDAP_LEVEL_ENTRY, "ldap_simple_bind_s\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_simple_bind_s\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_simple_bind_s\n", 0, 0, 0 );
#endif

6
libraries/libldap/search.c
View file

@ -21,7 +21,7 @@
#include <ac/time.h>
#include "ldap-int.h"
#include "ldap_log.h"
/*
* ldap_search_ext - initiate an ldap search operation.
@ -62,7 +62,7 @@ ldap_search_ext(
int timelimit;
#ifdef NEW_LOGGING
LDAP_LOG (( "search", LDAP_LEVEL_ENTRY, "ldap_search_ext\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_search_ext\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_search_ext\n", 0, 0, 0 );
#endif
@ -184,7 +184,7 @@ ldap_search(
BerElement *ber;
#ifdef NEW_LOGGING
LDAP_LOG (( "search", LDAP_LEVEL_ENTRY, "ldap_search\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_search\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_search\n", 0, 0, 0 );
#endif

111
libraries/libldap/tls.c
View file

@ -180,9 +180,9 @@ ldap_pvt_tls_init_def_ctx( void )
tls_def_ctx = SSL_CTX_new( SSLv23_method() );
if ( tls_def_ctx == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "tls", LDAP_LEVEL_ERR, "ldap_pvt_tls_init_def_ctx: "
LDAP_LOG ( TRANSPORT, ERR, "ldap_pvt_tls_init_def_ctx: "
"TLS could not allocate default ctx (%d).\n",
ERR_peek_error() ));
ERR_peek_error(), 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"TLS: could not allocate default ctx (%lu).\n",
@ -195,9 +195,9 @@ ldap_pvt_tls_init_def_ctx( void )
!SSL_CTX_set_cipher_list( tls_def_ctx, tls_opt_ciphersuite ) )
{
#ifdef NEW_LOGGING
LDAP_LOG (( "tls", LDAP_LEVEL_ERR, "ldap_pvt_tls_init_def_ctx: "
LDAP_LOG ( TRANSPORT, ERR, "ldap_pvt_tls_init_def_ctx: "
"TLS could not set cipher list %s.\n",
tls_opt_ciphersuite ));
tls_opt_ciphersuite, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"TLS: could not set cipher list %s.\n",
@ -213,12 +213,12 @@ ldap_pvt_tls_init_def_ctx( void )
!SSL_CTX_set_default_verify_paths( tls_def_ctx ) )
{
#ifdef NEW_LOGGING
LDAP_LOG (( "tls", LDAP_LEVEL_ERR,
LDAP_LOG ( TRANSPORT, ERR,
"ldap_pvt_tls_init_def_ctx: "
"TLS could not load verify locations "
"(file:`%s',dir:`%s').\n",
tls_opt_cacertfile ? tls_opt_cacertfile : "",
tls_opt_cacertdir ? tls_opt_cacertdir : "" ));
tls_opt_cacertdir ? tls_opt_cacertdir : "", 0 );
#else
Debug( LDAP_DEBUG_ANY, "TLS: "
"could not load verify locations (file:`%s',dir:`%s').\n",
@ -233,10 +233,10 @@ ldap_pvt_tls_init_def_ctx( void )
calist = get_ca_list( tls_opt_cacertfile, tls_opt_cacertdir );
if ( !calist ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "tls", LDAP_LEVEL_ERR, "ldap_pvt_tls_init_def_ctx: "
LDAP_LOG ( TRANSPORT, ERR, "ldap_pvt_tls_init_def_ctx: "
"TLS could not load client CA list (file: `%s',dir:`%s')\n",
tls_opt_cacertfile ? tls_opt_cacertfile : "",
tls_opt_cacertdir ? tls_opt_cacertdir : "" ));
tls_opt_cacertdir ? tls_opt_cacertdir : "", 0 );
#else
Debug( LDAP_DEBUG_ANY, "TLS: "
"could not load client CA list (file:`%s',dir:`%s').\n",
@ -256,8 +256,8 @@ ldap_pvt_tls_init_def_ctx( void )
tls_opt_keyfile, SSL_FILETYPE_PEM ) )
{
#ifdef NEW_LOGGING
LDAP_LOG (( "tls", LDAP_LEVEL_ERR, "ldap_pvt_tls_init_def_ctx: "
"TLS could not use key file `%s'.\n", tls_opt_keyfile ));
LDAP_LOG ( TRANSPORT, ERR, "ldap_pvt_tls_init_def_ctx: "
"TLS could not use key file `%s'.\n", tls_opt_keyfile, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"TLS: could not use key file `%s'.\n",
@ -272,8 +272,9 @@ ldap_pvt_tls_init_def_ctx( void )
tls_opt_certfile, SSL_FILETYPE_PEM ) )
{
#ifdef NEW_LOGGING
LDAP_LOG (( "tls", LDAP_LEVEL_ERR, "ldap_pvt_tls_init_def_ctx: "
"TLS could not use certificate `%s'.\n", tls_opt_certfile ));
LDAP_LOG ( TRANSPORT, ERR, "ldap_pvt_tls_init_def_ctx: "
"TLS could not use certificate `%s'.\n",
tls_opt_certfile, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"TLS: could not use certificate `%s'.\n",
@ -287,8 +288,9 @@ ldap_pvt_tls_init_def_ctx( void )
!SSL_CTX_check_private_key( tls_def_ctx ) )
{
#ifdef NEW_LOGGING
LDAP_LOG (( "tls", LDAP_LEVEL_ERR, "ldap_pvt_tls_init_def_ctx: "
"TLS private key mismatch.\n" ));
LDAP_LOG ( TRANSPORT, ERR,
"ldap_pvt_tls_init_def_ctx: TLS private key mismatch.\n",
0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"TLS: private key mismatch.\n",
@ -397,8 +399,8 @@ alloc_handle( void *ctx_arg )
ssl = SSL_new( ctx );
if ( ssl == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "tls", LDAP_LEVEL_ERR, "alloc_handle: "
"TLS can't create ssl handle.\n" ));
LDAP_LOG ( TRANSPORT, ERR,
"alloc_handle: TLS can't create ssl handle.\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,"TLS: can't create ssl handle.\n",0,0,0);
#endif
@ -739,8 +741,8 @@ ldap_int_tls_connect( LDAP *ld, LDAPConn *conn )
}
#ifdef NEW_LOGGING
LDAP_LOG (( "tls", LDAP_LEVEL_ERR, "ldap_int_tls_connect: "
"TLS can't connect.\n" ));
LDAP_LOG ( TRANSPORT, ERR,
"ldap_int_tls_connect: TLS can't connect.\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,"TLS: can't connect.\n",0,0,0);
#endif
@ -791,8 +793,8 @@ ldap_pvt_tls_accept( Sockbuf *sb, void *ctx_arg )
if ( update_flags( sb, ssl, err )) return 1;
#ifdef NEW_LOGGING
LDAP_LOG (( "tls", LDAP_LEVEL_ERR, "ldap_pvt_tls_accept: "
"TLS can't accept.\n" ));
LDAP_LOG ( TRANSPORT, ERR,
"ldap_pvt_tls_accept: TLS can't accept.\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,"TLS: can't accept.\n",0,0,0 );
#endif
@ -929,8 +931,9 @@ ldap_pvt_tls_check_hostname( void *s, const char *name_in )
x = tls_get_cert((SSL *)s);
if (!x) {
#ifdef NEW_LOGGING
LDAP_LOG (( "tls", LDAP_LEVEL_ERR, "ldap_pvt_tls_check_hostname: "
"TLS unable to get peer certificate.\n" ));
LDAP_LOG ( TRANSPORT, ERR,
"ldap_pvt_tls_check_hostname: "
"TLS unable to get peer certificate.\n" , 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"TLS: unable to get peer certificate.\n",
@ -1006,8 +1009,9 @@ ldap_pvt_tls_check_hostname( void *s, const char *name_in )
buf, sizeof(buf)) == -1)
{
#ifdef NEW_LOGGING
LDAP_LOG (( "tls", LDAP_LEVEL_ERR, "ldap_pvt_tls_check_hostname: "
"TLS unable to get common name from peer certificate.\n" ));
LDAP_LOG ( TRANSPORT, ERR, "ldap_pvt_tls_check_hostname: "
"TLS unable to get common name from peer certificate.\n",
0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"TLS: unable to get common name from peer certificate.\n",
@ -1016,9 +1020,9 @@ ldap_pvt_tls_check_hostname( void *s, const char *name_in )
} else if (strcasecmp(name, buf)) {
#ifdef NEW_LOGGING
LDAP_LOG (( "tls", LDAP_LEVEL_ERR, "ldap_pvt_tls_check_hostname: "
LDAP_LOG ( TRANSPORT, ERR, "ldap_pvt_tls_check_hostname: "
"TLS hostname (%s) does not match "
"common name in certificate (%s).\n", name, buf ));
"common name in certificate (%s).\n", name, buf, 0 );
#else
Debug( LDAP_DEBUG_ANY, "TLS: hostname (%s) does not match "
"common name in certificate (%s).\n",
@ -1344,8 +1348,8 @@ tls_info_cb( SSL *ssl, int where, int ret )
if ( where & SSL_CB_LOOP ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "tls", LDAP_LEVEL_DETAIL1, "tls_info_cb: "
"TLS trace: %s:%s\n", op, SSL_state_string_long( ssl ) ));
LDAP_LOG ( TRANSPORT, DETAIL1, "tls_info_cb: "
"TLS trace: %s:%s\n", op, SSL_state_string_long( ssl ), 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"TLS trace: %s:%s\n",
@ -1355,10 +1359,10 @@ tls_info_cb( SSL *ssl, int where, int ret )
} else if ( where & SSL_CB_ALERT ) {
op = ( where & SSL_CB_READ ) ? "read" : "write";
#ifdef NEW_LOGGING
LDAP_LOG (( "tls", LDAP_LEVEL_DETAIL1, "tls_info_cb: "
"TLS trace: SSL3 alert %s:%s:%s\n", op,
SSL_alert_type_string_long( ret ),
SSL_alert_desc_string_long( ret) ));
LDAP_LOG ( TRANSPORT, DETAIL1,
"tls_info_cb: TLS trace: SSL3 alert %s:%s:%s\n",
op, SSL_alert_type_string_long( ret ),
SSL_alert_desc_string_long( ret) );
#else
Debug( LDAP_DEBUG_TRACE,
"TLS trace: SSL3 alert %s:%s:%s\n",
@ -1370,8 +1374,9 @@ tls_info_cb( SSL *ssl, int where, int ret )
} else if ( where & SSL_CB_EXIT ) {
if ( ret == 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "tls", LDAP_LEVEL_ERR, "tls_info_cb: "
"TLS trace: %s:failed in %s\n", op, SSL_state_string_long( ssl ) ));
LDAP_LOG ( TRANSPORT, ERR,
"tls_info_cb: TLS trace: %s:failed in %s\n",
op, SSL_state_string_long( ssl ), 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"TLS trace: %s:failed in %s\n",
@ -1379,8 +1384,9 @@ tls_info_cb( SSL *ssl, int where, int ret )
#endif
} else if ( ret < 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "tls", LDAP_LEVEL_ERR, "tls_info_cb: "
"TLS trace: %s:error in %s\n", op, SSL_state_string_long( ssl ) ));
LDAP_LOG ( TRANSPORT, ERR,
"tls_info_cb: TLS trace: %s:error in %s\n",
op, SSL_state_string_long( ssl ), 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"TLS trace: %s:error in %s\n",
@ -1415,13 +1421,15 @@ tls_verify_cb( int ok, X509_STORE_CTX *ctx )
sname = X509_NAME_oneline( subject, NULL, 0 );
iname = X509_NAME_oneline( issuer, NULL, 0 );
#ifdef NEW_LOGGING
LDAP_LOG (( "tls", LDAP_LEVEL_ERR, "tls_verify_cb"
"TLS certificate verification: depth: %d, err: %d: "
"subject: %s, issuer: %s\n", errdepth, errnum,
sname ? sname : "-unknown-", iname ? iname : "-unknown-" ));
LDAP_LOG( TRANSPORT, ERR,
"TLS certificate verification: depth: %d, err: %d, subject: %s,",
errdepth, errnum,
sname ? sname : "-unknown-" );
LDAP_LOG( TRANSPORT, ERR, " issuer: %s\n", iname ? iname : "-unknown-", 0, 0 );
if ( !ok ) {
LDAP_LOG (( "tls", LDAP_LEVEL_ERR, "TLS certificate verification: Error, %s\n",
X509_verify_cert_error_string(errnum)));
LDAP_LOG ( TRANSPORT, ERR,
"TLS certificate verification: Error, %s\n",
X509_verify_cert_error_string(errnum), 0, 0 );
}
#else
Debug( LDAP_DEBUG_TRACE,
@ -1461,9 +1469,9 @@ tls_report_error( void )
while ( ( l = ERR_get_error_line( &file, &line ) ) != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "tls", LDAP_LEVEL_ERR,
LDAP_LOG ( TRANSPORT, ERR,
"tls_report_error: TLS %s %s:%d\n",
ERR_error_string( l, buf ), file, line ));
ERR_error_string( l, buf ), file, line );
#else
Debug( LDAP_DEBUG_ANY, "TLS: %s %s:%d\n",
ERR_error_string( l, buf ), file, line );
@ -1482,9 +1490,9 @@ tls_tmp_rsa_cb( SSL *ssl, int is_export, int key_length )
if ( !tmp_rsa ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "tls", LDAP_LEVEL_ERR,
"tls_tmp_rsa_cb: TLS Failed to generate temporary %d-bit %s RSA key\n",
key_length, is_export ? "export" : "domestic" ));
LDAP_LOG ( TRANSPORT, ERR,
"tls_tmp_rsa_cb: TLS Failed to generate temporary %d-bit %s "
"RSA key\n", key_length, is_export ? "export" : "domestic", 0 );
#else
Debug( LDAP_DEBUG_ANY,
"TLS: Failed to generate temporary %d-bit %s RSA key\n",
@ -1518,9 +1526,9 @@ tls_seed_PRNG( const char *randfile )
if (randfile == NULL) {
#ifdef NEW_LOGGING
LDAP_LOG (( "tls", LDAP_LEVEL_DETAIL1,
LDAP_LOG ( TRANSPORT, DETAIL1,
"tls_seed_PRNG: TLS Use configuration file or "
"$RANDFILE to define seed PRNG\n" ));
"$RANDFILE to define seed PRNG\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"TLS: Use configuration file or $RANDFILE to define seed PRNG\n",
@ -1533,8 +1541,9 @@ tls_seed_PRNG( const char *randfile )
if (RAND_status() == 0) {
#ifdef NEW_LOGGING
LDAP_LOG (( "tls", LDAP_LEVEL_DETAIL1,
"tls_seed_PRNG: TLS PRNG not been seeded with enough data\n" ));
LDAP_LOG ( TRANSPORT, DETAIL1,
"tls_seed_PRNG: TLS PRNG not been seeded with enough data\n",
0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"TLS: PRNG not been seeded with enough data\n",

4
libraries/libldap/unbind.c
View file

@ -59,7 +59,7 @@ int
ldap_unbind( LDAP *ld )
{
#ifdef NEW_LOGGING
LDAP_LOG (( "unbind", LDAP_LEVEL_ENTRY, "ldap_unbind\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_unbind\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_unbind\n", 0, 0, 0 );
#endif
@ -181,7 +181,7 @@ ldap_send_unbind(
BerElement *ber;
#ifdef NEW_LOGGING
LDAP_LOG (( "unbind", LDAP_LEVEL_ENTRY, "ldap_send_unbind\n" ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_send_unbind\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_send_unbind\n", 0, 0, 0 );
#endif

3
libraries/libldap/url.c
View file

@ -34,7 +34,6 @@
#include "ldap-int.h"
/* local functions */
static const char* skip_url_prefix LDAP_P((
const char *url,
@ -446,7 +445,7 @@ ldap_url_parse_ext( LDAP_CONST char *url_in, LDAPURLDesc **ludpp )
* the options and cause infinite recursion
*/
#ifdef NEW_LOGGING
LDAP_LOG (( "url", LDAP_LEVEL_ENTRY, "ldap_url_parse_ext(%s)\n", url_in ));
LDAP_LOG ( OPERATION, ENTRY, "ldap_url_parse_ext(%s)\n", url_in, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_url_parse_ext(%s)\n", url_in, 0, 0 );
#endif

4
libraries/liblutil/Makefile.in
View file

@ -13,11 +13,11 @@ NT_OBJS = ntservice.o slapdmsg.res
UNIX_SRCS = detach.c
UNIX_OBJS = detach.o
SRCS = base64.c csn.c debug.c entropy.c sasl.c signal.c hash.c \
SRCS = base64.c csn.c entropy.c sasl.c signal.c hash.c \
md5.c passwd.c sha1.c getpass.c lockf.c utils.c uuid.c sockpair.c \
@LIBSRCS@ $(@PLAT@_SRCS)
OBJS = base64.o csn.o debug.o entropy.o sasl.o signal.o hash.o \
OBJS = base64.o csn.o entropy.o sasl.o signal.o hash.o \
md5.o passwd.o sha1.o getpass.o lockf.o utils.o uuid.o sockpair.o \
@LIBOBJS@ $(@PLAT@_OBJS)

161
libraries/liblutil/debug.c
View file

@ -12,6 +12,7 @@
#include <ac/stdlib.h>
#include <ac/string.h>
#include <ac/time.h>
#include <ac/ctype.h>
#ifdef LDAP_SYSLOG
#include <ac/syslog.h>
@ -27,7 +28,7 @@ struct DEBUGLEVEL
int level;
};
static struct DEBUGLEVEL **levelArray;
int ldap_loglevels[LDAP_SUBSYS_NUM];
static long numLevels = 0;
static FILE *log_file = NULL;
@ -56,6 +57,39 @@ static char *lutil_levels[] = {"emergency", "alert", "critical",
"results", "detail1", "detail2",
NULL};
static char *lutil_subsys[LDAP_SUBSYS_NUM] = {"global","operation", "transport",
"connection", "filter", "ber",
"config", "acl", "cache", "index",
"ldif", "tools", "slapd", "slurpd",
"backend", "back_bdb", "back_ldbm",
"back_ldap", "back_meta", "back_mon" };
int lutil_mnem2subsys( const char *subsys )
{
int i;
for( i = 0; i < LDAP_SUBSYS_NUM; i++ )
{
if ( !strcasecmp( subsys, lutil_subsys[i] ) )
{
return i;
}
}
return 0;
}
void lutil_set_all_backends( level )
{
int i;
for( i = 0; i < LDAP_SUBSYS_NUM; i++ )
{
if ( !strncasecmp( "back_", lutil_subsys[i], strlen("back_") ) )
{
ldap_loglevels[i] = level;
}
}
}
int lutil_mnem2level( const char *level )
{
int i;
@ -71,36 +105,15 @@ int lutil_mnem2level( const char *level )
static void addSubsys( const char *subsys, int level )
{
int i, j;
int i, j, subsys_num;
if ( !strcasecmp( subsys, "global") ) global_level = level;
for( i = 0; i < numLevels; i++ )
if ( !strcasecmp( subsys, "backend" ) )
lutil_set_all_backends( level );
else
{
if ( levelArray[i] == NULL )
{
levelArray[i] = (struct DEBUGLEVEL*)ber_memalloc( sizeof( struct DEBUGLEVEL ) );
levelArray[i]->subsystem = (char*)ber_memalloc( strlen( subsys ) + 1 );
strcpy ( levelArray[i]->subsystem, subsys );
levelArray[i]->level = level;
return;
}
if( !strcasecmp( subsys, levelArray[i]->subsystem ) )
{
levelArray[i]->level = level;
return;
}
subsys_num = lutil_mnem2subsys(subsys);
ldap_loglevels[subsys_num] = level;
}
levelArray = (struct DEBUGLEVEL**)ber_memrealloc( levelArray, sizeof( struct DEBUGLEVEL* ) * (numLevels + 10) );
for( j = numLevels; j < (numLevels + 10); j++ )
{
levelArray[j] = NULL;
}
numLevels += 10;
levelArray[i] = (struct DEBUGLEVEL*)ber_memalloc( sizeof( struct DEBUGLEVEL ) );
levelArray[i]->subsystem = (char*)ber_memalloc( strlen( subsys ) + 1 );
strcpy( levelArray[i]->subsystem, subsys );
levelArray[i]->level = level;
return;
}
@ -127,27 +140,14 @@ void lutil_log_int(
struct tm *today;
#endif
int i;
char data[4096];
char * t_subsys;
char * tmp;
if ( levelArray == NULL ) return; /* logging isn't set up */
/*
* Look for the subsystem in the level array. When we find it,
* break out of the loop.
*/
for( i = 0; i < numLevels; i++ ) {
if ( levelArray[i] == NULL ) break;
if ( ! strcasecmp( levelArray[i]->subsystem, subsys ) ) break;
}
/*
* If we didn't find the subsystem, or the set level is less than
* the requested output level, don't output it.
*/
if ( (level > global_level) &&
((i > numLevels ) || (levelArray[i] == NULL) || ( level > levelArray[i]->level )) )
{
return;
}
t_subsys = strdup(subsys);
for(tmp = t_subsys, i = 0; i < strlen(t_subsys); i++, tmp++)
*tmp = TOUPPER( (unsigned char) *tmp );
#ifdef LDAP_SYSLOG
/* we're configured to use syslog */
@ -198,7 +198,10 @@ void lutil_log_int(
/*
* format the output data.
*/
fprintf(file, "\n%s:: ", t_subsys );
vfprintf( file, fmt, vl );
fflush( file );
}
/*
@ -206,13 +209,13 @@ void lutil_log_int(
* level of the log output and the format and data. Send this on to the
* internal routine with the print file, if any.
*/
void lutil_log( const char *subsys, int level, const char *fmt, ... )
void lutil_log( const int subsys, int level, const char *fmt, ... )
{
FILE* outfile = NULL;
va_list vl;
va_start( vl, fmt );
ber_get_option( NULL, LBER_OPT_LOG_PRINT_FILE, &outfile );
lutil_log_int( outfile, subsys, level, fmt, vl );
lutil_log_int( outfile, lutil_subsys[subsys], level, fmt, vl );
va_end( vl );
}
@ -232,32 +235,38 @@ void lutil_log_initialize(int argc, char **argv)
*/
for( i = 0; i < argc; i++ )
{
char *next = argv[i];
if ( i < argc-1 && next[0] == '-' && next[1] == 'd' )
{
char subsys[64];
int level;
char *optarg = argv[i+1];
char *index = strchr( optarg, '=' );
if ( index != NULL )
{
*index = 0;
strcpy ( subsys, optarg );
level = atoi( index+1 );
if ( level <= 0 ) level = lutil_mnem2level( index + 1 );
lutil_set_debug_level( subsys, level );
*index = '=';
}
else
{
global_level = atoi( optarg );
/*
* if a negative number was used, make the global level the
* maximum sane level.
*/
if ( global_level < 0 ) global_level = 65535;
}
}
char *next = argv[i];
if ( i < argc-1 && next[0] == '-' && next[1] == 'd' )
{
char subsys[64];
int level;
char *optarg = argv[i+1];
char *index = strchr( optarg, '=' );
if ( index != NULL )
{
*index = 0;
strcpy ( subsys, optarg );
level = atoi( index+1 );
if ( level <= 0 ) level = lutil_mnem2level( index + 1 );
lutil_set_debug_level( subsys, level );
*index = '=';
}
else
{
global_level = atoi( optarg );
ldap_loglevels[0] = global_level;
/*
* if a negative number was used, make the global level the
* maximum sane level.
*/
if ( global_level < 0 )
{
global_level = 65535;
ldap_loglevels[0] = 65535;
}
}
}
}
}

21
servers/slapd/abandon.c
View file

@ -35,8 +35,7 @@ do_abandon(
int rc;
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY, "conn: %d do_abandon\n",
conn->c_connid));
LDAP_LOG( OPERATION, ENTRY, "conn: %d do_abandon\n", conn->c_connid, 0, 0);
#else
Debug( LDAP_DEBUG_TRACE, "do_abandon\n", 0, 0, 0 );
#endif
@ -49,9 +48,8 @@ do_abandon(
if ( ber_scanf( op->o_ber, "i", &id ) == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"conn: %d do_abandon: ber_scanf failed\n",
conn->c_connid ));
LDAP_LOG( OPERATION, ERR,
"conn: %d do_abandon: ber_scanf failed\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "do_abandon: ber_scanf failed\n", 0, 0 ,0 );
#endif
@ -66,16 +64,17 @@ do_abandon(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
"do_abandon: conn: %d id=%ld\n", conn->c_connid, (long) id ));
LDAP_LOG( OPERATION, ARGS, "do_abandon: conn: %d id=%ld\n",
conn->c_connid, (long) id, 0 );
#else
Debug( LDAP_DEBUG_ARGS, "do_abandon: id=%ld\n", (long) id, 0 ,0 );
#endif
if( id <= 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_abandon: conn: %d bad msgid %ld\n", conn->c_connid, (long) id ));
LDAP_LOG( OPERATION, ERR,
"do_abandon: conn: %d bad msgid %ld\n",
conn->c_connid, (long) id, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"do_abandon: bad msgid %ld\n", (long) id, 0, 0 );
@ -109,9 +108,9 @@ done:
ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
LDAP_LOG( OPERATION, ENTRY,
"do_abandon: conn: %d op=%ld %sfound\n",
conn->c_connid, (long)id, o ? "" : "not " ));
conn->c_connid, (long)id, o ? "" : "not " );
#else
Debug( LDAP_DEBUG_TRACE, "do_abandon: op=%ld %sfound\n",
(long) id, o ? "" : "not ", 0 );

228
servers/slapd/acl.c
View file

@ -19,7 +19,6 @@
#define ACL_BUF_SIZE 1024 /* use most appropriate size */
/*
* speed up compares
*/
@ -122,6 +121,7 @@ access_allowed(
int ret = 1;
int count;
AccessControl *a;
#ifdef LDAP_DEBUG
char accessmaskbuf[ACCESSMASK_MAXLEN];
#endif
@ -152,9 +152,9 @@ access_allowed(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_ENTRY,
"access_allowed: conn %lu %s access to \"%s\" \"%s\" requested\n",
conn ? conn->c_connid : -1, access2str( access ), e->e_dn, attr ));
LDAP_LOG( ACL, ENTRY,
"access_allowed: %s access to \"%s\" \"%s\" requested\n",
access2str( access ), e->e_dn, attr );
#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: %s access to \"%s\" \"%s\" requested\n",
@ -172,9 +172,9 @@ access_allowed(
/* grant database root access */
if ( be != NULL && be_isroot( be, &op->o_ndn ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
"access_allowed: conn %lu root access granted\n",
conn->c_connid));
LDAP_LOG( ACL, INFO,
"access_allowed: conn %lu root access granted\n",
conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_ACL,
"<= root access granted\n",
@ -193,9 +193,9 @@ access_allowed(
&& desc != slap_schema.si_ad_children )
{
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"access_allowed: conn %lu NoUserMod Operational attribute: %s access granted\n",
conn->c_connid, attr ));
LDAP_LOG( ACL, DETAIL1,
"access_allowed: conn %lu NoUserMod Operational attribute: %s "
"access granted\n", conn->c_connid, attr , 0 );
#else
Debug( LDAP_DEBUG_ACL, "NoUserMod Operational attribute:"
" %s access granted\n",
@ -207,10 +207,11 @@ access_allowed(
/* use backend default access if no backend acls */
if( be != NULL && be->be_acl == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"access_allowed: conn %lu backend default %s access %s to \"%s\"\n",
conn->c_connid, access2str( access ),
be->be_dfltaccess >= access ? "granted" : "denied", op->o_dn.bv_val ));
LDAP_LOG( ACL, DETAIL1,
"access_allowed: backend default %s access %s to \"%s\"\n",
access2str( access ),
be->be_dfltaccess >= access ? "granted" : "denied",
op->o_dn.bv_val );
#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: backend default %s access %s to \"%s\"\n",
@ -225,10 +226,11 @@ access_allowed(
/* use global default access if no global acls */
} else if ( be == NULL && global_acl == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"access_allowed: conn %lu global default %s access %s to \"%s\"\n",
conn->c_connid, access2str( access ),
global_default_access >= access ? "granted" : "denied", op->o_dn.bv_val ));
LDAP_LOG( ACL, DETAIL1,
"access_allowed: global default %s access %s to \"%s\"\n",
access2str( access ),
global_default_access >= access ? "granted" : "denied",
op->o_dn.bv_val );
#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: global default %s access %s to \"%s\"\n",
@ -267,10 +269,9 @@ access_allowed(
for (i = 0; i < MAXREMATCHES && matches[i].rm_so > 0; i++) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"access_allowed: conn %lu match[%d]: %d %d ",
conn->c_connid, i,
(int)matches[i].rm_so, (int)matches[i].rm_eo ));
LDAP_LOG( ACL, DETAIL1,
"access_allowed: match[%d]: %d %d ",
i, (int)matches[i].rm_so, (int)matches[i].rm_eo );
#else
Debug( LDAP_DEBUG_ACL, "=> match[%d]: %d %d ", i,
(int)matches[i].rm_so, (int)matches[i].rm_eo );
@ -282,7 +283,7 @@ access_allowed(
}
}
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_ARGS, "\n" ));
LDAP_LOG( ACL, ARGS, "\n" , 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ARGS, "\n", 0, 0, 0 );
#endif
@ -301,9 +302,9 @@ vd_access:
if ( ACL_IS_INVALID( mask ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"access_allowed: conn %lu \"%s\" (%s) invalid!\n",
conn->c_connid, e->e_dn, attr ));
LDAP_LOG( ACL, DETAIL1,
"access_allowed: conn %lu \"%s\" (%s) invalid!\n",
conn->c_connid, e->e_dn, attr );
#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: \"%s\" (%s) invalid!\n",
@ -313,9 +314,8 @@ vd_access:
} else if ( control == ACL_BREAK ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"access_allowed: conn %lu no more rules\n",
conn->c_connid ));
LDAP_LOG( ACL, DETAIL1,
"access_allowed: conn %lu no more rules\n", conn->c_connid, 0,0 );
#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: no more rules\n", 0, 0, 0);
@ -325,12 +325,10 @@ vd_access:
}
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_ENTRY,
"access_allowed: conn %lu %s access %s by %s\n",
conn->c_connid,
access2str( access ),
ACL_GRANT( mask, access ) ? "granted" : "denied",
accessmask2str( mask, accessmaskbuf ) ));
LDAP_LOG( ACL, ENTRY,
"access_allowed: %s access %s by %s\n",
access2str( access ), ACL_GRANT( mask, access ) ? "granted" : "denied",
accessmask2str( mask, accessmaskbuf ) );
#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: %s access %s by %s\n",
@ -398,9 +396,10 @@ acl_get(
if ( a->acl_dn_pat.bv_len || ( a->acl_dn_style != ACL_STYLE_REGEX )) {
if ( a->acl_dn_style == ACL_STYLE_REGEX ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_get: dnpat [%d] %s nsub: %d\n",
*count, a->acl_dn_pat.bv_val, (int) a->acl_dn_re.re_nsub ));
LDAP_LOG( ACL, DETAIL1,
"acl_get: dnpat [%d] %s nsub: %d\n",
*count, a->acl_dn_pat.bv_val,
(int) a->acl_dn_re.re_nsub );
#else
Debug( LDAP_DEBUG_ACL, "=> dnpat: [%d] %s nsub: %d\n",
*count, a->acl_dn_pat.bv_val, (int) a->acl_dn_re.re_nsub );
@ -410,9 +409,8 @@ acl_get(
} else {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_get: dn [%d] %s\n",
*count, a->acl_dn_pat.bv_val ));
LDAP_LOG( ACL, DETAIL1, "acl_get: dn [%d] %s\n",
*count, a->acl_dn_pat.bv_val, 0 );
#else
Debug( LDAP_DEBUG_ACL, "=> dn: [%d] %s\n",
*count, a->acl_dn_pat.bv_val, 0 );
@ -455,9 +453,8 @@ acl_get(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_get: [%d] matched\n",
*count ));
LDAP_LOG( ACL, DETAIL1,
"acl_get: [%d] matched\n", *count, 0, 0 );
#else
Debug( LDAP_DEBUG_ACL, "=> acl_get: [%d] matched\n",
*count, 0, 0 );
@ -472,9 +469,8 @@ acl_get(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_get: [%d] check attr %s\n",
*count, attr ));
LDAP_LOG( ACL, DETAIL1,
"acl_get: [%d] check attr %s\n", *count, attr ,0 );
#else
Debug( LDAP_DEBUG_ACL, "=> acl_get: [%d] check attr %s\n",
*count, attr, 0);
@ -483,9 +479,8 @@ acl_get(
ad_inlist( desc, a->acl_attrs ) )
{
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_get: [%d] acl %s attr: %s\n",
*count, e->e_dn, attr ));
LDAP_LOG( ACL, DETAIL1,
"acl_get: [%d] acl %s attr: %s\n", *count, e->e_dn, attr );
#else
Debug( LDAP_DEBUG_ACL,
"<= acl_get: [%d] acl %s attr: %s\n",
@ -497,8 +492,7 @@ acl_get(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_ENTRY,
"acl_get: done.\n" ));
LDAP_LOG( ACL, RESULTS, "acl_get: done.\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ACL, "<= acl_get: done.\n", 0, 0, 0 );
#endif
@ -559,15 +553,14 @@ acl_mask(
assert( attr != NULL );
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_ENTRY,
"acl_mask: conn %lu access to entry \"%s\", attr \"%s\" requested\n",
conn->c_connid, e->e_dn, attr ));
LDAP_LOG( ACL, ENTRY,
"acl_mask: conn %lu access to entry \"%s\", attr \"%s\" requested\n",
conn->c_connid, e->e_dn, attr );
LDAP_LOG(( "acl", LDAP_LEVEL_ARGS,
" to %s by \"%s\", (%s) \n",
val ? "value" : "all values",
op->o_ndn.bv_val ? op->o_ndn.bv_val : "",
accessmask2str( *mask, accessmaskbuf ) ));
LDAP_LOG( ACL, ARGS,
" to %s by \"%s\", (%s) \n", val ? "value" : "all values",
op->o_ndn.bv_val ? op->o_ndn.bv_val : "",
accessmask2str( *mask, accessmaskbuf ) );
#else
Debug( LDAP_DEBUG_ACL,
"=> acl_mask: access to entry \"%s\", attr \"%s\" requested\n",
@ -599,9 +592,9 @@ acl_mask(
/* AND <who> clauses */
if ( b->a_dn_pat.bv_len != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_mask: conn %lu check a_dn_pat: %s\n",
conn->c_connid, b->a_dn_pat.bv_val ));
LDAP_LOG( ACL, DETAIL1,
"acl_mask: conn %lu check a_dn_pat: %s\n",
conn->c_connid, b->a_dn_pat.bv_val ,0 );
#else
Debug( LDAP_DEBUG_ACL, "<= check a_dn_pat: %s\n",
b->a_dn_pat.bv_val, 0, 0);
@ -723,9 +716,9 @@ dn_match_cleanup:;
if ( b->a_sockurl_pat.bv_len ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
LDAP_LOG( ACL, DETAIL1,
"acl_mask: conn %lu check a_sockurl_pat: %s\n",
conn->c_connid, b->a_sockurl_pat.bv_val ));
conn->c_connid, b->a_sockurl_pat.bv_val , 0 );
#else
Debug( LDAP_DEBUG_ACL, "<= check a_sockurl_pat: %s\n",
b->a_sockurl_pat.bv_val, 0, 0 );
@ -747,9 +740,9 @@ dn_match_cleanup:;
if ( b->a_domain_pat.bv_len ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
LDAP_LOG( ACL, DETAIL1,
"acl_mask: conn %lu check a_domain_pat: %s\n",
conn->c_connid, b->a_domain_pat.bv_val ));
conn->c_connid, b->a_domain_pat.bv_val , 0 );
#else
Debug( LDAP_DEBUG_ACL, "<= check a_domain_pat: %s\n",
b->a_domain_pat.bv_val, 0, 0 );
@ -801,9 +794,9 @@ dn_match_cleanup:;
if ( b->a_peername_pat.bv_len ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
LDAP_LOG( ACL, DETAIL1,
"acl_mask: conn %lu check a_perrname_path: %s\n",
conn->c_connid, b->a_peername_pat.bv_val ));
conn->c_connid, b->a_peername_pat.bv_val , 0 );
#else
Debug( LDAP_DEBUG_ACL, "<= check a_peername_path: %s\n",
b->a_peername_pat.bv_val, 0, 0 );
@ -824,9 +817,9 @@ dn_match_cleanup:;
if ( b->a_sockname_pat.bv_len ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
LDAP_LOG( ACL, DETAIL1,
"acl_mask: conn %lu check a_sockname_path: %s\n",
conn->c_connid, b->a_sockname_pat.bv_val ));
conn->c_connid, b->a_sockname_pat.bv_val , 0 );
#else
Debug( LDAP_DEBUG_ACL, "<= check a_sockname_path: %s\n",
b->a_sockname_pat.bv_val, 0, 0 );
@ -859,9 +852,9 @@ dn_match_cleanup:;
}
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
LDAP_LOG( ACL, DETAIL1,
"acl_mask: conn %lu check a_dn_pat: %s\n",
conn->c_connid, attr ));
conn->c_connid, attr , 0 );
#else
Debug( LDAP_DEBUG_ACL, "<= check a_dn_at: %s\n",
attr, 0, 0);
@ -970,9 +963,9 @@ dn_match_cleanup:;
if ( b->a_authz.sai_ssf ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_mask: conn %lu check a_authz.sai_ssf: ACL %u > OP %u\n",
conn->c_connid, b->a_authz.sai_ssf, op->o_ssf ));
LDAP_LOG( ACL, DETAIL1,
"acl_mask: conn %lu check a_authz.sai_ssf: ACL %u > OP %u\n",
conn->c_connid, b->a_authz.sai_ssf, op->o_ssf );
#else
Debug( LDAP_DEBUG_ACL, "<= check a_authz.sai_ssf: ACL %u > OP %u\n",
b->a_authz.sai_ssf, op->o_ssf, 0 );
@ -984,9 +977,11 @@ dn_match_cleanup:;
if ( b->a_authz.sai_transport_ssf ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_mask: conn %lu check a_authz.sai_transport_ssf: ACL %u > OP %u\n",
conn->c_connid, b->a_authz.sai_transport_ssf, op->o_transport_ssf ));
LDAP_LOG( ACL, DETAIL1,
"acl_mask: conn %lu check a_authz.sai_transport_ssf: "
"ACL %u > OP %u\n",
conn->c_connid, b->a_authz.sai_transport_ssf,
op->o_transport_ssf );
#else
Debug( LDAP_DEBUG_ACL,
"<= check a_authz.sai_transport_ssf: ACL %u > OP %u\n",
@ -999,9 +994,10 @@ dn_match_cleanup:;
if ( b->a_authz.sai_tls_ssf ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_mask: conn %lu check a_authz.sai_tls_ssf: ACL %u > OP %u\n",
conn->c_connid, b->a_authz.sai_tls_ssf, op->o_tls_ssf ));
LDAP_LOG( ACL, DETAIL1,
"acl_mask: conn %lu check a_authz.sai_tls_ssf: ACL %u > "
"OP %u\n",
conn->c_connid, b->a_authz.sai_tls_ssf, op->o_tls_ssf );
#else
Debug( LDAP_DEBUG_ACL,
"<= check a_authz.sai_tls_ssf: ACL %u > OP %u\n",
@ -1014,9 +1010,10 @@ dn_match_cleanup:;
if ( b->a_authz.sai_sasl_ssf ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_mask: conn %lu check a_authz.sai_sasl_ssf: ACL %u > OP %u\n",
conn->c_connid, b->a_authz.sai_sasl_ssf, op->o_sasl_ssf ));
LDAP_LOG( ACL, DETAIL1,
"acl_mask: conn %lu check a_authz.sai_sasl_ssf: "
"ACL %u > OP %u\n",
conn->c_connid, b->a_authz.sai_sasl_ssf, op->o_sasl_ssf );
#else
Debug( LDAP_DEBUG_ACL,
"<= check a_authz.sai_sasl_ssf: ACL %u > OP %u\n",
@ -1109,11 +1106,11 @@ dn_match_cleanup:;
}
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_RESULTS,
"acl_mask: conn %lu [%d] applying %s (%s)\n",
conn->c_connid, i, accessmask2str( modmask, accessmaskbuf),
LDAP_LOG( ACL, RESULTS,
"acl_mask: [%d] applying %s (%s)\n",
i, accessmask2str( modmask, accessmaskbuf),
b->a_type == ACL_CONTINUE ? "continue" : b->a_type == ACL_BREAK
? "break" : "stop" ));
? "break" : "stop" );
#else
Debug( LDAP_DEBUG_ACL,
"<= acl_mask: [%d] applying %s (%s)\n",
@ -1147,9 +1144,9 @@ dn_match_cleanup:;
}
#ifdef NEW_LOGGING
LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
LDAP_LOG( ACL, DETAIL1,
"acl_mask: conn %lu [%d] mask: %s\n",
conn->c_connid, i, accessmask2str( *mask, accessmaskbuf) ));
conn->c_connid, i, accessmask2str( *mask, accessmaskbuf) );
#else
Debug( LDAP_DEBUG_ACL,
"<= acl_mask: [%d] mask: %s\n",
@ -1171,9 +1168,9 @@ dn_match_cleanup:;
ACL_INIT(*mask);
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_RESULTS,
LDAP_LOG( ACL, RESULTS,
"acl_mask: conn %lu no more <who> clauses, returning %d (stop)\n",
conn->c_connid, accessmask2str( *mask, accessmaskbuf) ));
conn->c_connid, accessmask2str( *mask, accessmaskbuf) , 0 );
#else
Debug( LDAP_DEBUG_ACL,
"<= acl_mask: no more <who> clauses, returning %s (stop)\n",
@ -1205,9 +1202,9 @@ acl_check_modlist(
/* short circuit root database access */
if ( be_isroot( be, &op->o_ndn ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
LDAP_LOG( ACL, DETAIL1,
"acl_check_modlist: conn %lu access granted to root user\n",
conn->c_connid ));
conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_ACL,
"<= acl_access_allowed: granted to database root\n",
@ -1219,10 +1216,11 @@ acl_check_modlist(
/* use backend default access if no backend acls */
if( be != NULL && be->be_acl == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
"acl_check_modlist: conn %lu backend default %s access %s to \"%s\"\n",
conn->c_connid, access2str( ACL_WRITE ),
be->be_dfltaccess >= ACL_WRITE ? "granted" : "denied", op->o_dn.bv_val ));
LDAP_LOG( ACL, DETAIL1,
"acl_check_modlist: backend default %s access %s to \"%s\"\n",
access2str( ACL_WRITE ),
be->be_dfltaccess >= ACL_WRITE ? "granted" : "denied",
op->o_dn.bv_val );
#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: backend default %s access %s to \"%s\"\n",
@ -1236,10 +1234,11 @@ acl_check_modlist(
/* use global default access if no global acls */
} else if ( be == NULL && global_acl == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
"acl_check_modlist: conn %lu global default %s access %s to \"%s\"\n",
conn->c_connid, access2str( ACL_WRITE ),
global_default_access >= ACL_WRITE ? "granted" : "denied", op->o_dn ));
LDAP_LOG( ACL, DETAIL1,
"acl_check_modlist: global default %s access %s to \"%s\"\n",
access2str( ACL_WRITE ),
global_default_access >= ACL_WRITE ? "granted" : "denied",
op->o_dn );
#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: global default %s access %s to \"%s\"\n",
@ -1261,9 +1260,9 @@ acl_check_modlist(
*/
if ( is_at_no_user_mod( mlist->sml_desc->ad_type ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
LDAP_LOG( ACL, DETAIL1,
"acl_check_modlist: conn %lu no-user-mod %s: modify access granted\n",
conn->c_connid, mlist->sml_desc->ad_cname.bv_val ));
conn->c_connid, mlist->sml_desc->ad_cname.bv_val , 0 );
#else
Debug( LDAP_DEBUG_ACL, "acl: no-user-mod %s:"
" modify access granted\n",
@ -1889,10 +1888,9 @@ string_expand(
bv->bv_len = size;
#ifdef NEW_LOGGING
LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
"string_expand: pattern = %.*s\n", (int)pat->bv_len, pat->bv_val ));
LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
"string_expand: expanded = %s\n", bv->bv_val ));
LDAP_LOG( ACL, DETAIL1,
"string_expand: pattern = %.*s\n", (int)pat->bv_len, pat->bv_val, 0 );
LDAP_LOG( ACL, DETAIL1, "string_expand: expanded = %s\n", bv->bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "=> string_expand: pattern: %.*s\n", (int)pat->bv_len, pat->bv_val, 0 );
Debug( LDAP_DEBUG_TRACE, "=> string_expand: expanded: %s\n", bv->bv_val, 0, 0 );
@ -1923,9 +1921,9 @@ regex_matches(
regerror(rc, &re, error, sizeof(error));
#ifdef NEW_LOGGING
LDAP_LOG(( "aci", LDAP_LEVEL_ERR,
LDAP_LOG( ACL, ERR,
"regex_matches: compile( \"%s\", \"%s\") failed %s\n",
pat->bv_val, str, error ));
pat->bv_val, str, error );
#else
Debug( LDAP_DEBUG_TRACE,
"compile( \"%s\", \"%s\") failed %s\n",
@ -1938,11 +1936,9 @@ regex_matches(
regfree( &re );
#ifdef NEW_LOGGING
LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL2,
"regex_matches: string: %s\n", str ));
LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL2,
"regex_matches: rc: %d %s\n",
rc, rc ? "matches" : "no matches" ));
LDAP_LOG( ACL, DETAIL2, "regex_matches: string: %s\n", str, 0, 0 );
LDAP_LOG( ACL, DETAIL2, "regex_matches: rc: %d %s\n",
rc, rc ? "matches" : "no matches", 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"=> regex_matches: string: %s\n", str, 0, 0 );

36
servers/slapd/add.c
View file

@ -50,8 +50,7 @@ do_add( Connection *conn, Operation *op )
int manageDSAit;
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"do_add: conn %d enter\n", conn->c_connid ));
LDAP_LOG( OPERATION, ENTRY, "do_add: conn %d enter\n", conn->c_connid,0,0 );
#else
Debug( LDAP_DEBUG_TRACE, "do_add\n", 0, 0, 0 );
#endif
@ -70,8 +69,8 @@ do_add( Connection *conn, Operation *op )
/* get the name */
if ( ber_scanf( ber, "{m", /*}*/ &dn ) == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_add: conn %d ber_scanf failed\n", conn->c_connid ));
LDAP_LOG( OPERATION, ERR,
"do_add: conn %d ber_scanf failed\n", conn->c_connid,0,0 );
#else
Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 );
#endif
@ -86,9 +85,8 @@ do_add( Connection *conn, Operation *op )
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_add: conn %d invalid dn (%s)\n", conn->c_connid,
dn.bv_val ));
LDAP_LOG( OPERATION, ERR,
"do_add: conn %d invalid dn (%s)\n", conn->c_connid, dn.bv_val, 0 );
#else
Debug( LDAP_DEBUG_ANY, "do_add: invalid dn (%s)\n", dn.bv_val, 0, 0 );
#endif
@ -98,8 +96,8 @@ do_add( Connection *conn, Operation *op )
}
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
"do_add: conn %d dn (%s)\n", conn->c_connid, e->e_dn ));
LDAP_LOG( OPERATION, ARGS,
"do_add: conn %d dn (%s)\n", conn->c_connid, e->e_dn, 0 );
#else
Debug( LDAP_DEBUG_ARGS, "do_add: dn (%s)\n", e->e_dn, 0, 0 );
#endif
@ -115,8 +113,8 @@ do_add( Connection *conn, Operation *op )
if ( rtag == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_add: conn %d decoding error \n", conn->c_connid ));
LDAP_LOG( OPERATION, ERR,
"do_add: conn %d decoding error \n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "do_add: decoding error\n", 0, 0, 0 );
#endif
@ -128,9 +126,9 @@ do_add( Connection *conn, Operation *op )
if ( tmp.sml_bvalues == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
LDAP_LOG( OPERATION, INFO,
"do_add: conn %d no values for type %s\n",
conn->c_connid, tmp.sml_type.bv_val ));
conn->c_connid, tmp.sml_type.bv_val, 0 );
#else
Debug( LDAP_DEBUG_ANY, "no values for type %s\n",
tmp.sml_type.bv_val, 0, 0 );
@ -153,8 +151,8 @@ do_add( Connection *conn, Operation *op )
if ( ber_scanf( ber, /*{*/ "}") == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_add: conn %d ber_scanf failed\n", conn->c_connid ));
LDAP_LOG( OPERATION, ERR,
"do_add: conn %d ber_scanf failed\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 );
#endif
@ -166,8 +164,8 @@ do_add( Connection *conn, Operation *op )
if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"do_add: conn %d get_ctrls failed\n", conn->c_connid ));
LDAP_LOG( OPERATION, INFO,
"do_add: conn %d get_ctrls failed\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "do_add: get_ctrls failed\n", 0, 0, 0 );
#endif
@ -309,8 +307,8 @@ do_add( Connection *conn, Operation *op )
}
} else {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"do_add: conn %d no backend support\n", conn->c_connid ));
LDAP_LOG( OPERATION, INFO,
"do_add: conn %d no backend support\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_ARGS, " do_add: no backend support\n", 0, 0, 0 );
#endif

3
servers/slapd/ava.c
View file

@ -44,8 +44,7 @@ get_ava(
if( rtag == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
"get_ava: ber_scanf failure\n" ));
LDAP_LOG( FILTER, ERR, "get_ava: ber_scanf failure\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, " get_ava ber_scanf\n", 0, 0, 0 );
#endif

50
servers/slapd/back-bdb/add.c
View file

@ -41,7 +41,7 @@ bdb_add(
#endif
#ifdef NEW_LOGGING
LDAP_LOG (( "add", LDAP_LEVEL_ARGS, "==> bdb_add: %s\n", e->e_dn ));
LDAP_LOG ( OPERATION, ARGS, "==> bdb_add: %s\n", e->e_dn, 0, 0 );
#else
Debug(LDAP_DEBUG_ARGS, "==> bdb_add: %s\n", e->e_dn, 0, 0);
#endif
@ -50,7 +50,8 @@ bdb_add(
rc = entry_schema_check( be, e, NULL, &text, textbuf, textlen );
if ( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "add", LDAP_LEVEL_ERR, "bdb_add: entry failed schema check: %s (%d)\n", text, rc ));
LDAP_LOG ( OPERATION, ERR,
"bdb_add: entry failed schema check: %s (%d)\n", text, rc, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_add: entry failed schema check: %s (%d)\n",
@ -70,7 +71,8 @@ bdb_add(
rc = bdb_next_id( be, NULL, &e->e_id );
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "add", LDAP_LEVEL_ERR, "bdb_add: next_id failed (%d)\n", rc ));
LDAP_LOG ( OPERATION, ERR,
"bdb_add: next_id failed (%d)\n", rc, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_add: next_id failed (%d)\n",
@ -100,7 +102,8 @@ retry: /* transaction retry */
text = NULL;
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "add", LDAP_LEVEL_ERR, "bdb_add: txn_begin failed: %s (%d)\n", db_strerror(rc), rc ));
LDAP_LOG ( OPERATION, ERR,
"bdb_add: txn_begin failed: %s (%d)\n", db_strerror(rc), rc, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_add: txn_begin failed: %s (%d)\n",
@ -182,7 +185,8 @@ retry: /* transaction retry */
}
#ifdef NEW_LOGGING
LDAP_LOG (( "add", LDAP_LEVEL_DETAIL1, "bdb_add: parent does not exist\n" ));
LDAP_LOG ( OPERATION, DETAIL1,
"bdb_add: parent does not exist\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "bdb_add: parent does not exist\n",
0, 0, 0 );
@ -211,7 +215,8 @@ retry: /* transaction retry */
if ( ! rc ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "add", LDAP_LEVEL_DETAIL1, "bdb_add: no write access to parent\n" ));
LDAP_LOG ( OPERATION, DETAIL1,
"bdb_add: no write access to parent\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "bdb_add: no write access to parent\n",
0, 0, 0 );
@ -225,7 +230,8 @@ retry: /* transaction retry */
if ( is_entry_subentry( p ) ) {
/* parent is a subentry, don't allow add */
#ifdef NEW_LOGGING
LDAP_LOG (( "add", LDAP_LEVEL_DETAIL1, "bdb_add: parent is subentry\n" ));
LDAP_LOG ( OPERATION, DETAIL1,
"bdb_add: parent is subentry\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "bdb_add: parent is subentry\n",
0, 0, 0 );
@ -239,7 +245,8 @@ retry: /* transaction retry */
if ( is_entry_alias( p ) ) {
/* parent is an alias, don't allow add */
#ifdef NEW_LOGGING
LDAP_LOG (( "add", LDAP_LEVEL_DETAIL1, "bdb_add: parent is alias\n" ));
LDAP_LOG ( OPERATION, DETAIL1,
"bdb_add: parent is alias\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "bdb_add: parent is alias\n",
0, 0, 0 );
@ -256,7 +263,8 @@ retry: /* transaction retry */
BerVarray refs = get_entry_referrals( be, conn, op, p );
#ifdef NEW_LOGGING
LDAP_LOG (( "add", LDAP_LEVEL_DETAIL1, "bdb_add: parent is referral\n" ));
LDAP_LOG ( OPERATION, DETAIL1,
"bdb_add: parent is referral\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "bdb_add: parent is referral\n",
0, 0, 0 );
@ -305,7 +313,8 @@ retry: /* transaction retry */
if ( ! rc ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "add", LDAP_LEVEL_DETAIL1, "bdb_add: no write access to parent\n" ));
LDAP_LOG ( OPERATION, DETAIL1,
"bdb_add: no write access to parent\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_add: no write access to parent\n",
@ -318,7 +327,8 @@ retry: /* transaction retry */
} else {
#ifdef NEW_LOGGING
LDAP_LOG (( "add", LDAP_LEVEL_DETAIL1, "bdb_add: %s denied\n", pdn.bv_len == 0 ? "suffix" : "entry at root" ));
LDAP_LOG ( OPERATION, DETAIL1, "bdb_add: %s denied\n",
pdn.bv_len == 0 ? "suffix" : "entry at root", 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "bdb_add: %s denied\n",
pdn.bv_len == 0 ? "suffix" : "entry at root",
@ -332,7 +342,8 @@ retry: /* transaction retry */
#ifdef BDB_SUBENTRIES
if( subentry ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "add", LDAP_LEVEL_DETAIL1, "bdb_add: no parent, cannot add subentry\n" ));
LDAP_LOG ( OPERATION, DETAIL1,
"bdb_add: no parent, cannot add subentry\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_add: no parent, cannot add subentry\n",
@ -358,7 +369,8 @@ retry: /* transaction retry */
rc = bdb_dn2id_add( be, ltid, &pdn, e );
if ( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "add", LDAP_LEVEL_ERR, "bdb_add: dn2id_add failed: %s (%d)\n", db_strerror(rc), rc ));
LDAP_LOG ( OPERATION, ERR,
"bdb_add: dn2id_add failed: %s (%d)\n", db_strerror(rc), rc, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "bdb_add: dn2id_add failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
@ -381,7 +393,7 @@ retry: /* transaction retry */
rc = bdb_id2entry_add( be, ltid, e );
if ( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "add", LDAP_LEVEL_ERR, "bdb_add: id2entry_add failed\n" ));
LDAP_LOG ( OPERATION, ERR, "bdb_add: id2entry_add failed\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "bdb_add: id2entry_add failed\n",
0, 0, 0 );
@ -401,7 +413,8 @@ retry: /* transaction retry */
rc = bdb_index_entry_add( be, ltid, e, e->e_attrs );
if ( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "add", LDAP_LEVEL_ERR, "bdb_add: index_entry_add failed\n" ));
LDAP_LOG ( OPERATION, ERR,
"bdb_add: index_entry_add failed\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "bdb_add: index_entry_add failed\n",
0, 0, 0 );
@ -471,7 +484,9 @@ retry: /* transaction retry */
if (rc == LDAP_SUCCESS) {
#ifdef NEW_LOGGING
LDAP_LOG (( "add", LDAP_LEVEL_RESULTS, "bdb_add: added%s id=%08lx dn=\"%s\"\n", op->o_noop ? " (no-op)" : "", e->e_id, e->e_dn ));
LDAP_LOG ( OPERATION, RESULTS,
"bdb_add: added%s id=%08lx dn=\"%s\"\n",
op->o_noop ? " (no-op)" : "", e->e_id, e->e_dn );
#else
Debug(LDAP_DEBUG_TRACE, "bdb_add: added%s id=%08lx dn=\"%s\"\n",
op->o_noop ? " (no-op)" : "", e->e_id, e->e_dn );
@ -481,7 +496,8 @@ retry: /* transaction retry */
}
else {
#ifdef NEW_LOGGING
LDAP_LOG (( "add", LDAP_LEVEL_ERR, "bdb_add: %s : %s (%d)\n", text, db_strerror(rc), rc ));
LDAP_LOG ( OPERATION, ERR,
"bdb_add: %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 );

4
servers/slapd/back-bdb/attr.c
View file

@ -181,9 +181,9 @@ bdb_attr_index_config(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
LDAP_LOG( BACK_BDB, DETAIL1,
"attr_index_config: index %s 0x%04lx\n",
ad->ad_cname.bv_val, mask ));
ad->ad_cname.bv_val, mask, 0 );
#else
Debug( LDAP_DEBUG_CONFIG, "index %s 0x%04lx\n",
ad->ad_cname.bv_val, mask, 0 );

45
servers/slapd/back-bdb/attribute.c
View file

@ -43,13 +43,12 @@ bdb_attribute(
DB_LOCK lock;
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ARGS,
"bdb_attribute: gr dn: \"%s\"\n", entry_ndn->bv_val ));
LDAP_LOG(( "backend", LDAP_LEVEL_ARGS,
"bdb_attribute: at: \"%s\"\n", entry_at_name));
LDAP_LOG(( "backend", LDAP_LEVEL_ARGS,
"bdb_attribute: tr dn: \"%s\"\n",
target ? target->e_ndn : "" ));
LDAP_LOG( BACK_BDB, ARGS,
"bdb_attribute: gr dn: \"%s\"\n", entry_ndn->bv_val, 0, 0 );
LDAP_LOG( BACK_BDB, ARGS,
"bdb_attribute: at: \"%s\"\n", entry_at_name, 0, 0);
LDAP_LOG( BACK_BDB, ARGS, "bdb_attribute: tr dn: \"%s\"\n",
target ? target->e_ndn : "", 0, 0 );
#else
Debug( LDAP_DEBUG_ARGS,
"=> bdb_attribute: gr dn: \"%s\"\n",
@ -77,9 +76,8 @@ bdb_attribute(
/* we already have a LOCKED copy of the entry */
e = target;
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"bdb_attribute: target is LOCKED (%s)\n",
entry_ndn->bv_val ));
LDAP_LOG( BACK_BDB, DETAIL1,
"bdb_attribute: target is LOCKED (%s)\n", entry_ndn->bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ARGS,
"=> bdb_attribute: target is entry: \"%s\"\n",
@ -109,9 +107,9 @@ dn2entry_retry:
}
if (e == NULL) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"bdb_attribute: cannot find entry (%s)\n",
entry_ndn->bv_val ));
LDAP_LOG( BACK_BDB, INFO,
"bdb_attribute: cannot find entry (%s)\n",
entry_ndn->bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ACL,
"=> bdb_attribute: cannot find entry: \"%s\"\n",
@ -124,9 +122,8 @@ dn2entry_retry:
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"bdb_attribute: found entry (%s)\n",
entry_ndn->bv_val ));
LDAP_LOG( BACK_BDB, DETAIL1, "bdb_attribute: found entry (%s)\n",
entry_ndn->bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ACL,
"=> bdb_attribute: found entry: \"%s\"\n",
@ -138,8 +135,8 @@ dn2entry_retry:
/* find attribute values */
if( is_entry_alias( e ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"bdb_attribute: entry (%s) is an alias\n", e->e_dn ));
LDAP_LOG( BACK_BDB, INFO,
"bdb_attribute: entry (%s) is an alias\n", e->e_dn, 0, 0 );
#else
Debug( LDAP_DEBUG_ACL,
"<= bdb_attribute: entry is an alias\n", 0, 0, 0 );
@ -151,8 +148,8 @@ dn2entry_retry:
if( is_entry_referral( e ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"bdb_attribute: entry (%s) is a referral.\n", e->e_dn ));
LDAP_LOG( BACK_BDB, INFO,
"bdb_attribute: entry (%s) is a referral.\n", e->e_dn, 0, 0);
#else
Debug( LDAP_DEBUG_ACL,
"<= bdb_attribute: entry is a referral\n", 0, 0, 0 );
@ -171,8 +168,8 @@ dn2entry_retry:
if ((attr = attr_find(e->e_attrs, entry_at)) == NULL) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"bdb_attribute: failed to find %s.\n", entry_at_name ));
LDAP_LOG( BACK_BDB, INFO,
"bdb_attribute: failed to find %s.\n", entry_at_name, 0, 0 );
#else
Debug( LDAP_DEBUG_ACL,
"<= bdb_attribute: failed to find %s\n",
@ -231,9 +228,7 @@ return_results:
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
"bdb_attribute: rc=%d nvals=%d.\n",
rc, j ));
LDAP_LOG( BACK_BDB, ENTRY, "bdb_attribute: rc=%d nvals=%d.\n", rc, j, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_attribute: rc=%d nvals=%d\n",

10
servers/slapd/back-bdb/bind.c
View file

@ -44,7 +44,7 @@ bdb_bind(
DB_LOCK lock;
#ifdef NEW_LOGGING
LDAP_LOG (( "bind", LDAP_LEVEL_ARGS, "==> bdb_bind: dn: %s\n", dn->bv_val ));
LDAP_LOG ( OPERATION, ARGS, "==> bdb_bind: dn: %s\n", dn->bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ARGS, "==> bdb_bind: dn: %s\n", dn->bv_val, 0, 0);
#endif
@ -134,7 +134,8 @@ dn2entry_retry:
if ( is_entry_subentry( e ) ) {
/* entry is an subentry, don't allow bind */
#ifdef NEW_LOGGING
LDAP_LOG (( "bind", LDAP_LEVEL_DETAIL1, "bdb_bind: entry is subentry\n" ));
LDAP_LOG ( OPERATION, DETAIL1,
"bdb_bind: entry is subentry\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "entry is subentry\n", 0,
0, 0 );
@ -151,7 +152,7 @@ dn2entry_retry:
if ( is_entry_alias( e ) ) {
/* entry is an alias, don't allow bind */
#ifdef NEW_LOGGING
LDAP_LOG (( "bind", LDAP_LEVEL_DETAIL1, "bdb_bind: entry is alias\n" ));
LDAP_LOG ( OPERATION, DETAIL1, "bdb_bind: entry is alias\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "entry is alias\n", 0,
0, 0 );
@ -170,7 +171,8 @@ dn2entry_retry:
conn, op, e );
#ifdef NEW_LOGGING
LDAP_LOG (( "bind", LDAP_LEVEL_DETAIL1, "bdb_bind: entry is referral\n" ));
LDAP_LOG ( OPERATION, DETAIL1,
"bdb_bind: entry is referral\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0,
0, 0 );

149
servers/slapd/back-bdb/cache.c
View file

@ -49,9 +49,9 @@ static int
bdb_cache_entry_rdwr_lock(Entry *e, int rw)
{
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_ENTRY,
"bdb_cache_entry_rdwr_lock: %s lock on ID %ld\n",
rw ? "w" : "r", e->e_id ));
LDAP_LOG( CACHE, ENTRY,
"bdb_cache_entry_rdwr_lock: %s lock on ID %ld\n",
rw ? "w" : "r", e->e_id, 0 );
#else
Debug( LDAP_DEBUG_ARGS, "entry_rdwr_%slock: ID: %ld\n",
rw ? "w" : "r", e->e_id, 0);
@ -67,9 +67,9 @@ static int
bdb_cache_entry_rdwr_trylock(Entry *e, int rw)
{
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_ENTRY,
"bdb_cache_entry_rdwr_trylock: try %s lock on ID: %ld.\n",
rw ? "w" : "r", e->e_id ));
LDAP_LOG( CACHE, ENTRY,
"bdb_cache_entry_rdwr_trylock: try %s lock on ID: %ld.\n",
rw ? "w" : "r", e->e_id, 0 );
#else
Debug( LDAP_DEBUG_ARGS, "entry_rdwr_%strylock: ID: %ld\n",
rw ? "w" : "r", e->e_id, 0);
@ -85,9 +85,9 @@ static int
bdb_cache_entry_rdwr_unlock(Entry *e, int rw)
{
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_ENTRY,
"bdb_cache_entry_rdwr_unlock: remove %s lock on ID %ld.\n",
rw ? "w" : "r", e->e_id ));
LDAP_LOG( CACHE, ENTRY,
"bdb_cache_entry_rdwr_unlock: remove %s lock on ID %ld.\n",
rw ? "w" : "r", e->e_id, 0 );
#else
Debug( LDAP_DEBUG_ARGS, "entry_rdwr_%sunlock: ID: %ld\n",
rw ? "w" : "r", e->e_id, 0);
@ -232,9 +232,9 @@ bdb_unlocked_cache_return_entry_rw( Cache *cache, Entry *e, int rw )
ldap_pvt_thread_rdwr_wunlock( &cache->c_rwlock );
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
LDAP_LOG( CACHE, DETAIL1,
"bdb_unlocked_cache_return_entry_rw: return (%ld):%s, refcnt=%d\n",
id, rw ? "w" : "r", refcnt ));
id, rw ? "w" : "r", refcnt );
#else
Debug( LDAP_DEBUG_TRACE,
"====> bdb_unlocked_cache_return_entry_%s( %ld ): created (%d)\n",
@ -248,9 +248,9 @@ bdb_unlocked_cache_return_entry_rw( Cache *cache, Entry *e, int rw )
ldap_pvt_thread_rdwr_wunlock( &cache->c_rwlock );
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
LDAP_LOG( CACHE, DETAIL1,
"bdb_unlocked_cache_return_entry_rw: %ld, delete pending (%d).\n",
id, refcnt ));
id, refcnt, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"====> bdb_unlocked_cache_return_entry_%s( %ld ): delete pending (%d)\n",
@ -267,9 +267,9 @@ bdb_unlocked_cache_return_entry_rw( Cache *cache, Entry *e, int rw )
ldap_pvt_thread_rdwr_wunlock( &cache->c_rwlock );
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
LDAP_LOG( CACHE, DETAIL1,
"bdb_unlocked_cache_return_entry_rw: (%ld): deleted (%d)\n",
id, refcnt ));
id, refcnt, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"====> bdb_unlocked_cache_return_entry_%s( %ld ): deleted (%d)\n",
@ -282,9 +282,9 @@ bdb_unlocked_cache_return_entry_rw( Cache *cache, Entry *e, int rw )
ldap_pvt_thread_rdwr_wunlock( &cache->c_rwlock );
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
LDAP_LOG( CACHE, DETAIL1,
"bdb_unlocked_cache_return_entry_rw: ID %ld:%s returned (%d)\n",
id, rw ? "w": "r", refcnt ));
id, rw ? "w": "r", refcnt );
#else
Debug( LDAP_DEBUG_TRACE,
"====> bdb_unlocked_cache_return_entry_%s( %ld ): returned (%d)\n",
@ -335,9 +335,9 @@ bdb_cache_return_entry_rw
ldap_pvt_thread_rdwr_wunlock( &cache->c_rwlock );
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
LDAP_LOG( CACHE, DETAIL1,
"bdb_cache_return_entry_rw: return (%ld):%s, refcnt=%d\n",
id, rw ? "w" : "r", refcnt ));
id, rw ? "w" : "r", refcnt );
#else
Debug( LDAP_DEBUG_TRACE,
"====> bdb_cache_return_entry_%s( %ld ): created (%d)\n",
@ -351,9 +351,9 @@ bdb_cache_return_entry_rw
ldap_pvt_thread_rdwr_wunlock( &cache->c_rwlock );
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
LDAP_LOG( CACHE, DETAIL1,
"bdb_cache_return_entry_rw: %ld, delete pending (%d).\n",
id, refcnt ));
id, refcnt, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"====> bdb_cache_return_entry_%s( %ld ): delete pending (%d)\n",
@ -370,9 +370,9 @@ bdb_cache_return_entry_rw
ldap_pvt_thread_rdwr_wunlock( &cache->c_rwlock );
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
LDAP_LOG( CACHE, DETAIL1,
"bdb_cache_return_entry_rw: (%ld): deleted (%d)\n",
id, refcnt ));
id, refcnt, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"====> bdb_cache_return_entry_%s( %ld ): deleted (%d)\n",
@ -385,9 +385,9 @@ bdb_cache_return_entry_rw
ldap_pvt_thread_rdwr_wunlock( &cache->c_rwlock );
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
LDAP_LOG( CACHE, DETAIL1,
"bdb_cache_return_entry_rw: ID %ld:%s returned (%d)\n",
id, rw ? "w": "r", refcnt ));
id, rw ? "w": "r", refcnt );
#else
Debug( LDAP_DEBUG_TRACE,
"====> bdb_cache_return_entry_%s( %ld ): returned (%d)\n",
@ -442,9 +442,9 @@ bdb_cache_add_entry_rw(
Entry *ee;
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_ENTRY,
"bdb_cache_add_entry_rw: add (%s):%s to cache\n",
e->e_dn, rw ? "w" : "r" ));
LDAP_LOG( CACHE, ENTRY,
"bdb_cache_add_entry_rw: add (%s):%s to cache\n",
e->e_dn, rw ? "w" : "r", 0 );
#endif
/* set cache write lock */
ldap_pvt_thread_rdwr_wlock( &cache->c_rwlock );
@ -456,9 +456,9 @@ bdb_cache_add_entry_rw(
ldap_pvt_thread_rdwr_wunlock( &cache->c_rwlock );
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_ERR,
"bdb_cache_add_entry_rw: add (%s):%ld private init failed!\n",
e->e_dn, e->e_id ));
LDAP_LOG( CACHE, ERR,
"bdb_cache_add_entry_rw: add (%s):%ld private init failed!\n",
e->e_dn, e->e_id, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"====> bdb_cache_add_entry( %ld ): \"%s\": private init failed!\n",
@ -476,9 +476,9 @@ bdb_cache_add_entry_rw(
ldap_pvt_thread_rdwr_wunlock( &cache->c_rwlock );
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
"bdb_cache_add_entry: (%s):%ld already in cache.\n",
e->e_dn, e->e_id ));
LDAP_LOG( CACHE, DETAIL1,
"bdb_cache_add_entry: (%s):%ld already in cache.\n",
e->e_dn, e->e_id, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"====> bdb_cache_add_entry( %ld ): \"%s\": already in dn cache\n",
@ -495,9 +495,9 @@ bdb_cache_add_entry_rw(
(AVL_CMP) entry_id_cmp, avl_dup_error ) != 0 )
{
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
"bdb_cache_add_entry: (%s):%ls already in cache.\n",
e->e_dn, e->e_id ));
LDAP_LOG( CACHE, DETAIL1,
"bdb_cache_add_entry: (%s):%ls already in cache.\n",
e->e_dn, e->e_id, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"====> bdb_cache_add_entry( %ld ): \"%s\": already in id cache\n",
@ -509,9 +509,9 @@ bdb_cache_add_entry_rw(
(AVL_CMP) entry_dn_cmp ) == NULL )
{
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_INFO,
"bdb_cache_add_entry: can't delete (%s) from cache.\n",
e->e_dn ));
LDAP_LOG( CACHE, INFO,
"bdb_cache_add_entry: can't delete (%s) from cache.\n",
e->e_dn, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "====> can't delete from dn cache\n",
0, 0, 0 );
@ -535,8 +535,9 @@ bdb_cache_add_entry_rw(
if ( avl_delete( &cache->c_idtree, (caddr_t) e,
(AVL_CMP) entry_id_cmp ) == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_INFO,
"bdb_cache_add_entry: can't delete (%s) from cache.\n", e->e_dn ));
LDAP_LOG( CACHE, INFO,
"bdb_cache_add_entry: can't delete (%s) from cache.\n",
e->e_dn, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "====> can't delete from id cache\n", 0, 0, 0 );
#endif
@ -544,8 +545,9 @@ bdb_cache_add_entry_rw(
if ( avl_delete( &cache->c_dntree, (caddr_t) e,
(AVL_CMP) entry_dn_cmp ) == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_INFO,
"bdb_cache_add_entry: can't delete (%s) from cache.\n", e->e_dn ));
LDAP_LOG( CACHE, INFO,
"bdb_cache_add_entry: can't delete (%s) from cache.\n",
e->e_dn, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "====> can't delete from dn cache\n", 0, 0, 0 );
#endif
@ -633,9 +635,9 @@ bdb_cache_update_entry(
(AVL_CMP) entry_dn_cmp, avl_dup_error ) != 0 )
{
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
"bdb_cache_update_entry: (%s):%ld already in dn cache\n",
e->e_dn, e->e_id ));
LDAP_LOG( CACHE, DETAIL1,
"bdb_cache_update_entry: (%s):%ld already in dn cache\n",
e->e_dn, e->e_id, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"====> bdb_cache_update_entry( %ld ): \"%s\": already in dn cache\n",
@ -652,9 +654,9 @@ bdb_cache_update_entry(
(AVL_CMP) entry_id_cmp, avl_dup_error ) != 0 )
{
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
"bdb_cache_update_entry: (%s)%ld already in id cache\n",
e->e_dn, e->e_id ));
LDAP_LOG( CACHE, DETAIL1,
"bdb_cache_update_entry: (%s)%ld already in id cache\n",
e->e_dn, e->e_id, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"====> bdb_cache_update_entry( %ld ): \"%s\": already in id cache\n",
@ -666,9 +668,9 @@ bdb_cache_update_entry(
(AVL_CMP) entry_dn_cmp ) == NULL )
{
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_INFO,
"bdb_cache_update_entry: can't delete (%s)%ld from dn cache.\n",
e->e_dn, e->e_id ));
LDAP_LOG( CACHE, INFO,
"bdb_cache_update_entry: can't delete (%s)%ld from dn cache.\n",
e->e_dn, e->e_id, 0 );
#else
Debug( LDAP_DEBUG_ANY, "====> can't delete from dn cache\n",
0, 0, 0 );
@ -778,9 +780,9 @@ try_again:
ldap_pvt_thread_rdwr_runlock( &cache->c_rwlock );
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_INFO,
"bdb_cache_find_entry_dn2id: (%s) %ld not ready: %d\n",
ndn->bv_val, id, state ));
LDAP_LOG( CACHE, INFO,
"bdb_cache_find_entry_dn2id: (%s) %ld not ready: %d\n",
ndn->bv_val, id, state );
#else
Debug(LDAP_DEBUG_TRACE,
"====> bdb_cache_find_entry_dn2id(\"%s\"): %ld (not ready) %d\n",
@ -806,9 +808,9 @@ try_again:
ldap_pvt_thread_mutex_unlock( &cache->lru_mutex );
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
"bdb_cache_find_entry_dn2id: (%s): %ld %d tries\n",
ndn->bv_val, id, count ));
LDAP_LOG( CACHE, DETAIL1,
"bdb_cache_find_entry_dn2id: (%s): %ld %d tries\n",
ndn->bv_val, id, count );
#else
Debug(LDAP_DEBUG_TRACE,
"====> bdb_cache_find_entry_dn2id(\"%s\"): %ld (%d tries)\n",
@ -874,9 +876,9 @@ try_again:
ldap_pvt_thread_rdwr_runlock( &cache->c_rwlock );
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_INFO,
"bdb_cache_find_entry_id: (%ld)->%ld not ready (%d).\n",
id, ep_id, state ));
LDAP_LOG( CACHE, INFO,
"bdb_cache_find_entry_id: (%ld)->%ld not ready (%d).\n",
id, ep_id, state );
#else
Debug(LDAP_DEBUG_TRACE,
@ -905,9 +907,9 @@ try_again:
ldap_pvt_thread_rdwr_runlock( &cache->c_rwlock );
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_INFO,
"bdb_cache_find_entry_id: %ld -> %ld (busy) %d.\n",
id, ep_id, state ));
LDAP_LOG( CACHE, INFO,
"bdb_cache_find_entry_id: %ld -> %ld (busy) %d.\n",
id, ep_id, state );
#else
Debug(LDAP_DEBUG_TRACE,
"====> bdb_cache_find_entry_id( %ld ): %ld (busy) %d\n",
@ -935,9 +937,9 @@ try_again:
ldap_pvt_thread_mutex_unlock( &cache->lru_mutex );
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
"bdb_cache_find_entry_id: %ld -> %s found %d tries.\n",
ep_id, ep->e_dn, count ));
LDAP_LOG( CACHE, DETAIL1,
"bdb_cache_find_entry_id: %ld -> %s found %d tries.\n",
ep_id, ep->e_dn, count );
#else
Debug(LDAP_DEBUG_TRACE,
"====> bdb_cache_find_entry_id( %ld ) \"%s\" (found) (%d tries)\n",
@ -979,8 +981,8 @@ bdb_cache_delete_entry(
assert( e->e_private );
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_ENTRY,
"bdb_cache_delete_entry: delete %ld.\n", e->e_id ));
LDAP_LOG( CACHE, ENTRY,
"bdb_cache_delete_entry: delete %ld.\n", e->e_id, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "====> bdb_cache_delete_entry( %ld )\n",
e->e_id, 0, 0 );
@ -1047,8 +1049,7 @@ bdb_cache_release_all( Cache *cache )
ldap_pvt_thread_mutex_lock( &cache->lru_mutex );
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_ENTRY,
"bdb_cache_release_all: enter\n" ));
LDAP_LOG( CACHE, ENTRY, "bdb_cache_release_all: enter\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "====> bdb_cache_release_all\n", 0, 0, 0 );
#endif
@ -1067,8 +1068,8 @@ bdb_cache_release_all( Cache *cache )
if ( cache->c_cursize ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_INFO,
"bdb_cache_release_all: Entry cache could not be emptied.\n" ));
LDAP_LOG( CACHE, INFO,
"bdb_cache_release_all: Entry cache could not be emptied.\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "Entry-cache could not be emptied\n", 0, 0, 0 );
#endif

3
servers/slapd/back-bdb/compare.c
View file

@ -88,7 +88,8 @@ dn2entry_retry:
conn, op, e );
#ifdef NEW_LOGGING
LDAP_LOG (( "compare", LDAP_LEVEL_DETAIL1,"bdb_compare: entry is referral\n" ));
LDAP_LOG ( OPERATION, DETAIL1,
"bdb_compare: entry is referral\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0,
0, 0 );

8
servers/slapd/back-bdb/dbcache.c
View file

@ -87,7 +87,9 @@ bdb_db_cache(
rc = db_create( &db->bdi_db, bdb->bi_dbenv, 0 );
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "dbcache", LDAP_LEVEL_ERR, "bdb_db_cache: db_create(%s) failed: %s (%d)\n", bdb->bi_dbenv_home, db_strerror(rc), rc ));
LDAP_LOG ( CACHE, ERR,
"bdb_db_cache: db_create(%s) failed: %s (%d)\n",
bdb->bi_dbenv_home, db_strerror(rc), rc );
#else
Debug( LDAP_DEBUG_ANY,
"bdb_db_cache: db_create(%s) failed: %s (%d)\n",
@ -116,7 +118,9 @@ bdb_db_cache(
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "dbcache", LDAP_LEVEL_ERR, "bdb_db_cache: db_open(%s) failed: %s (%d)\n", name, db_strerror(rc), rc ));
LDAP_LOG ( CACHE, ERR,
"bdb_db_cache: db_open(%s) failed: %s (%d)\n",
name, db_strerror(rc), rc );
#else
Debug( LDAP_DEBUG_ANY,
"bdb_db_cache: db_open(%s) failed: %s (%d)\n",

70
servers/slapd/back-bdb/delete.c
View file

@ -42,8 +42,7 @@ bdb_delete(
#endif
#ifdef NEW_LOGGING
LDAP_LOG (( "delete", LDAP_LEVEL_ARGS, "==> bdb_delete: %s\n",
dn->bv_val ));
LDAP_LOG ( OPERATION, ARGS, "==> bdb_delete: %s\n", dn->bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ARGS, "==> bdb_delete: %s\n",
dn->bv_val, 0, 0 );
@ -55,8 +54,8 @@ retry: /* transaction retry */
bdb_unlocked_cache_return_entry_w(&bdb->bi_cache, e);
}
#ifdef NEW_LOGGING
LDAP_LOG (( "delete", LDAP_LEVEL_DETAIL1,
"==> bdb_delete: retrying...\n" ));
LDAP_LOG ( OPERATION, DETAIL1,
"==> bdb_delete: retrying...\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "==> bdb_delete: retrying...\n",
0, 0, 0 );
@ -78,9 +77,9 @@ retry: /* transaction retry */
text = NULL;
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "delete", LDAP_LEVEL_ERR,
LDAP_LOG ( OPERATION, ERR,
"==> bdb_delete: txn_begin failed: %s (%d)\n",
db_strerror(rc), rc ));
db_strerror(rc), rc, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_delete: txn_begin failed: %s (%d)\n",
@ -136,8 +135,8 @@ retry: /* transaction retry */
if( p == NULL) {
#ifdef NEW_LOGGING
LDAP_LOG (( "delete", LDAP_LEVEL_DETAIL1,
"<=- bdb_delete: parent does not exist\n" ));
LDAP_LOG ( OPERATION, DETAIL1,
"<=- bdb_delete: parent does not exist\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"<=- bdb_delete: parent does not exist\n",
@ -163,8 +162,8 @@ retry: /* transaction retry */
if ( !rc ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "delete", LDAP_LEVEL_DETAIL1,
"<=- bdb_delete: no access to parent\n" ));
LDAP_LOG ( OPERATION, DETAIL1,
"<=- bdb_delete: no access to parent\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"<=- bdb_delete: no access to parent\n",
@ -194,8 +193,8 @@ retry: /* transaction retry */
if ( !rc ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "delete", LDAP_LEVEL_DETAIL1,
"<=- bdb_delete: no access to parent\n" ));
LDAP_LOG ( OPERATION, DETAIL1,
"<=- bdb_delete: no access to parent\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"<=- bdb_delete: no access "
@ -207,8 +206,8 @@ retry: /* transaction retry */
} else {
#ifdef NEW_LOGGING
LDAP_LOG (( "delete", LDAP_LEVEL_DETAIL1,
"<=- bdb_delete: no parent and not root\n" ));
LDAP_LOG ( OPERATION, DETAIL1,
"<=- bdb_delete: no parent and not root\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"<=- bdb_delete: no parent "
@ -254,9 +253,8 @@ retry: /* transaction retry */
BerVarray refs;
#ifdef NEW_LOGGING
LDAP_LOG (( "delete", LDAP_LEVEL_ARGS,
"<=- bdb_delete: no such object %s\n",
dn->bv_val ));
LDAP_LOG ( OPERATION, ARGS,
"<=- bdb_delete: no such object %s\n", dn->bv_val, 0, 0);
#else
Debug( LDAP_DEBUG_ARGS,
"<=- bdb_delete: no such object %s\n",
@ -292,8 +290,8 @@ retry: /* transaction retry */
conn, op, e );
#ifdef NEW_LOGGING
LDAP_LOG (( "delete", LDAP_LEVEL_DETAIL1,
"<=- bdb_delete: entry is referral\n" ));
LDAP_LOG ( OPERATION, DETAIL1,
"<=- bdb_delete: entry is referral\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_delete: entry is referral\n",
@ -317,9 +315,8 @@ retry: /* transaction retry */
goto retry;
case 0:
#ifdef NEW_LOGGING
LDAP_LOG (( "delete", LDAP_LEVEL_DETAIL1,
"<=- bdb_delete: non-leaf %s\n",
dn->bv_val ));
LDAP_LOG ( OPERATION, DETAIL1,
"<=- bdb_delete: non-leaf %s\n", dn->bv_val, 0, 0 );
#else
Debug(LDAP_DEBUG_ARGS,
"<=- bdb_delete: non-leaf %s\n",
@ -330,9 +327,9 @@ retry: /* transaction retry */
break;
default:
#ifdef NEW_LOGGING
LDAP_LOG (( "delete", LDAP_LEVEL_ERR,
LDAP_LOG ( OPERATION, ERR,
"<=- bdb_delete: has_children failed %s (%d)\n",
db_strerror(rc), rc ));
db_strerror(rc), rc, 0 );
#else
Debug(LDAP_DEBUG_ARGS,
"<=- bdb_delete: has_children failed: %s (%d)\n",
@ -355,9 +352,8 @@ retry: /* transaction retry */
rc = LDAP_OTHER;
}
#ifdef NEW_LOGGING
LDAP_LOG (( "delete", LDAP_LEVEL_ERR,
"<=- bdb_delete: dn2id failed %s (%d)\n",
db_strerror(rc), rc ));
LDAP_LOG ( OPERATION, ERR,
"<=- bdb_delete: dn2id failed %s (%d)\n", db_strerror(rc), rc, 0 );
#else
Debug(LDAP_DEBUG_ARGS,
"<=- bdb_delete: dn2id failed: %s (%d)\n",
@ -378,9 +374,9 @@ retry: /* transaction retry */
rc = LDAP_OTHER;
}
#ifdef NEW_LOGGING
LDAP_LOG (( "delete", LDAP_LEVEL_ERR,
"<=- bdb_delete: id2entry failed: %s (%d)\n",
db_strerror(rc), rc ));
LDAP_LOG ( OPERATION, ERR,
"<=- bdb_delete: id2entry failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
#else
Debug(LDAP_DEBUG_ARGS,
"<=- bdb_delete: id2entry failed: %s (%d)\n",
@ -401,8 +397,8 @@ retry: /* transaction retry */
rc = LDAP_OTHER;
}
#ifdef NEW_LOGGING
LDAP_LOG (( "delete", LDAP_LEVEL_ERR,
"<=- bdb_delete: entry index delete failed!\n" ));
LDAP_LOG ( OPERATION, ERR,
"<=- bdb_delete: entry index delete failed!\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "entry index delete failed!\n",
0, 0, 0 );
@ -429,10 +425,9 @@ retry: /* transaction retry */
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "delete", LDAP_LEVEL_ERR,
LDAP_LOG ( OPERATION, ERR,
"bdb_delete: txn_%s failed: %s (%d)\n",
op->o_noop ? "abort (no-op)" : "commit",
db_strerror(rc), rc ));
op->o_noop ? "abort (no-op)" : "commit", db_strerror(rc), rc );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_delete: txn_%s failed: %s (%d)\n",
@ -444,10 +439,9 @@ retry: /* transaction retry */
} else {
#ifdef NEW_LOGGING
LDAP_LOG (( "delete", LDAP_LEVEL_RESULTS,
LDAP_LOG ( OPERATION, RESULTS,
"bdb_delete: deleted%s id=%08lx db=\"%s\"\n",
op->o_noop ? " (no-op)" : "",
e->e_id, e->e_dn ));
op->o_noop ? " (no-op)" : "", e->e_id, e->e_dn );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_delete: deleted%s id=%08lx dn=\"%s\"\n",

4
servers/slapd/back-bdb/dn2entry.c
View file

@ -12,6 +12,7 @@
#include "back-bdb.h"
/*
* dn2entry - look up dn in the cache/indexes and return the corresponding
* entry.
@ -33,8 +34,7 @@ bdb_dn2entry_rw(
ID id, id2 = 0;
#ifdef NEW_LOGGING
LDAP_LOG (( "db2entry", LDAP_LEVEL_ARGS, "bdb_dn2entry_rw(\"%s\")\n",
dn->bv_val ));
LDAP_LOG ( CACHE, ARGS, "bdb_dn2entry_rw(\"%s\")\n", dn->bv_val, 0, 0 );
#else
Debug(LDAP_DEBUG_TRACE, "bdb_dn2entry_rw(\"%s\")\n",
dn->bv_val, 0, 0 );

104
servers/slapd/back-bdb/dn2id.c
View file

@ -29,8 +29,8 @@ bdb_dn2id_add(
struct berval ptr, pdn;
#ifdef NEW_LOGGING
LDAP_LOG (( "db2id", LDAP_LEVEL_ARGS, "bdb_dn2id_add( \"%s\", 0x%08lx )\n",
e->e_ndn, (long) e->e_id ));
LDAP_LOG ( INDEX, ARGS, "bdb_dn2id_add( \"%s\", 0x%08lx )\n",
e->e_ndn, (long) e->e_id, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_add( \"%s\", 0x%08lx )\n",
e->e_ndn, (long) e->e_id, 0 );
@ -57,9 +57,8 @@ bdb_dn2id_add(
rc = db->put( db, txn, &key, &data, DB_NOOVERWRITE );
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "db2id", LDAP_LEVEL_ERR,
"bdb_dn2id_add: put failed: %s %d\n",
db_strerror(rc), rc ));
LDAP_LOG ( INDEX, ERR, "bdb_dn2id_add: put failed: %s %d\n",
db_strerror(rc), rc, 0 );
#else
Debug( LDAP_DEBUG_ANY, "=> bdb_dn2id_add: put failed: %s %d\n",
db_strerror(rc), rc, 0 );
@ -72,9 +71,9 @@ bdb_dn2id_add(
rc = bdb_idl_insert_key( be, db, txn, &key, e->e_id );
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "db2id", LDAP_LEVEL_ERR,
"=> bdb_dn2id_add: subtree (%s) insert failed: %d\n",
ptr.bv_val, rc ));
LDAP_LOG ( INDEX, ERR,
"=> bdb_dn2id_add: subtree (%s) insert failed: %d\n",
ptr.bv_val, rc, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"=> bdb_dn2id_add: subtree (%s) insert failed: %d\n",
@ -95,9 +94,9 @@ bdb_dn2id_add(
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "db2id", LDAP_LEVEL_ERR,
LDAP_LOG ( INDEX, ERR,
"=> bdb_dn2id_add: parent (%s) insert failed: %d\n",
ptr.bv_val, rc ));
ptr.bv_val, rc, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"=> bdb_dn2id_add: parent (%s) insert failed: %d\n",
@ -114,9 +113,9 @@ bdb_dn2id_add(
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "db2id", LDAP_LEVEL_ERR,
LDAP_LOG ( INDEX, ERR,
"=> bdb_dn2id_add: subtree (%s) insert failed: %d\n",
ptr.bv_val, rc ));
ptr.bv_val, rc, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"=> bdb_dn2id_add: subtree (%s) insert failed: %d\n",
@ -135,8 +134,7 @@ bdb_dn2id_add(
done:
ch_free( buf );
#ifdef NEW_LOGGING
LDAP_LOG (( "db2id", LDAP_LEVEL_RESULTS,
"<= bdb_dn2id_add: %d\n", rc ));
LDAP_LOG ( INDEX, RESULTS, "<= bdb_dn2id_add: %d\n", rc, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_add: %d\n", rc, 0, 0 );
#endif
@ -158,9 +156,8 @@ bdb_dn2id_delete(
struct berval pdn, ptr;
#ifdef NEW_LOGGING
LDAP_LOG (( "db2id", LDAP_LEVEL_ARGS,
"=> bdb_dn2id_delete ( \"%s\", 0x08lx )\n",
e->e_ndn, e->e_id ));
LDAP_LOG ( INDEX, ARGS,
"=> bdb_dn2id_delete ( \"%s\", 0x%08lx )\n", e->e_ndn, e->e_id, 0);
#else
Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_delete( \"%s\", 0x%08lx )\n",
e->e_ndn, e->e_id, 0 );
@ -181,9 +178,9 @@ bdb_dn2id_delete(
rc = db->del( db, txn, &key, 0 );
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "db2id", LDAP_LEVEL_ERR,
LDAP_LOG ( INDEX, ERR,
"=> bdb_dn2id_delete: delete failed: %s %d\n",
db_strerror(rc), rc ));
db_strerror(rc), rc, 0 );
#else
Debug( LDAP_DEBUG_ANY, "=> bdb_dn2id_delete: delete failed: %s %d\n",
db_strerror(rc), rc, 0 );
@ -196,9 +193,9 @@ bdb_dn2id_delete(
rc = db->del( db, txn, &key, 0 );
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "db2id", LDAP_LEVEL_ERR,
"=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n",
ptr.bv_val, rc ));
LDAP_LOG ( INDEX, ERR,
"=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n",
ptr.bv_val, rc, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n",
@ -219,9 +216,9 @@ bdb_dn2id_delete(
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "db2id", LDAP_LEVEL_ERR,
LDAP_LOG ( INDEX, ERR,
"=> bdb_dn2id_delete: parent (%s) delete failed: %d\n",
ptr.bv_val, rc ));
ptr.bv_val, rc, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"=> bdb_dn2id_delete: parent (%s) delete failed: %d\n",
@ -237,9 +234,9 @@ bdb_dn2id_delete(
rc = bdb_idl_delete_key( be, db, txn, &key, e->e_id );
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "db2id", LDAP_LEVEL_ERR,
LDAP_LOG ( INDEX, ERR,
"=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n",
ptr.bv_val, rc ));
ptr.bv_val, rc, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n",
@ -258,7 +255,7 @@ bdb_dn2id_delete(
done:
ch_free( buf );
#ifdef NEW_LOGGING
LDAP_LOG (( "db2id", LDAP_LEVEL_RESULTS, "<= bdb_dn2id_delete %d\n", rc ));
LDAP_LOG ( INDEX, RESULTS, "<= bdb_dn2id_delete %d\n", rc, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_delete %d\n", rc, 0, 0 );
#endif
@ -279,8 +276,7 @@ bdb_dn2id(
DB *db = bdb->bi_dn2id->bdi_db;
#ifdef NEW_LOGGING
LDAP_LOG (( "db2id", LDAP_LEVEL_ARGS, "=> bdb_dn2id( \"%s\" )\n",
dn->bv_val ));
LDAP_LOG ( INDEX, ARGS, "=> bdb_dn2id( \"%s\" )\n", dn->bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id( \"%s\" )\n", dn->bv_val, 0, 0 );
#endif
@ -309,17 +305,16 @@ bdb_dn2id(
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "db2id", LDAP_LEVEL_ERR,
"<= bdb_dn2id: get failed %s (%d)\n",
db_strerror(rc), rc ));
LDAP_LOG ( INDEX, ERR, "<= bdb_dn2id: get failed %s (%d)\n",
db_strerror(rc), rc, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id: get failed: %s (%d)\n",
db_strerror( rc ), rc, 0 );
#endif
} else {
#ifdef NEW_LOGGING
LDAP_LOG (( "db2id", LDAP_LEVEL_RESULTS,
"<= bdb_dn2id: got id=0x%08lx\n", *id ));
LDAP_LOG ( INDEX, RESULTS,
"<= bdb_dn2id: got id=0x%08lx\n", *id, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id: got id=0x%08lx\n",
*id, 0, 0 );
@ -348,8 +343,8 @@ bdb_dn2id_matched(
ID cached_id;
#ifdef NEW_LOGGING
LDAP_LOG (( "db2id", LDAP_LEVEL_ARGS,
"=> bdb_dn2id_matched( \"%s\" )\n", in->bv_val ));
LDAP_LOG ( INDEX, ARGS,
"=> bdb_dn2id_matched( \"%s\" )\n", in->bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_matched( \"%s\" )\n", in->bv_val, 0, 0 );
#endif
@ -395,8 +390,8 @@ bdb_dn2id_matched(
dnParent( &dn, &pdn );
} else {
#ifdef NEW_LOGGING
LDAP_LOG (( "db2id", LDAP_LEVEL_DETAIL1,
"<= bdb_dn2id_matched: no match\n" ));
LDAP_LOG ( INDEX, DETAIL1,
"<= bdb_dn2id_matched: no match\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"<= bdb_dn2id_matched: no match\n",
@ -412,10 +407,10 @@ bdb_dn2id_matched(
} else if ( rc == 0 ) {
if( data.size != sizeof( ID ) ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "db2id", LDAP_LEVEL_DETAIL1,
LDAP_LOG ( INDEX, DETAIL1,
"<= bdb_dn2id_matched: get size mismatch:"
"expected %ld, got %ld\n",
(long) sizeof(ID), (long) data.size ));
(long) sizeof(ID), (long) data.size, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"<= bdb_dn2id_matched: get size mismatch: "
@ -429,9 +424,9 @@ bdb_dn2id_matched(
}
#ifdef NEW_LOGGING
LDAP_LOG (( "db2id", LDAP_LEVEL_DETAIL1,
LDAP_LOG ( INDEX, DETAIL1,
"<= bdb_dn2id_matched: id=0x%08lx: %s %s\n",
(long) *id, *id2 == 0 ? "entry" : "matched", dn.bv_val ));
(long) *id, *id2 == 0 ? "entry" : "matched", dn.bv_val );
#else
Debug( LDAP_DEBUG_TRACE,
"<= bdb_dn2id_matched: id=0x%08lx: %s %s\n",
@ -441,9 +436,9 @@ bdb_dn2id_matched(
} else {
#ifdef NEW_LOGGING
LDAP_LOG (( "db2id", LDAP_LEVEL_ERR,
LDAP_LOG ( INDEX, ERR,
"<= bdb_dn2id_matched: get failed: %s (%d)\n",
db_strerror(rc), rc ));
db_strerror(rc), rc, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"<= bdb_dn2id_matched: get failed: %s (%d)\n",
@ -471,8 +466,8 @@ bdb_dn2id_children(
ID id;
#ifdef NEW_LOGGING
LDAP_LOG (( "db2id", LDAP_LEVEL_ARGS,
"=> bdb_dn2id_children( %s )\n", dn->bv_val ));
LDAP_LOG ( INDEX, ARGS,
"=> bdb_dn2id_children( %s )\n", dn->bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_children( %s )\n",
dn->bv_val, 0, 0 );
@ -496,10 +491,10 @@ bdb_dn2id_children(
free( key.data );
#ifdef NEW_LOGGING
LDAP_LOG (( "db2id", LDAP_LEVEL_DETAIL1,
LDAP_LOG ( INDEX, DETAIL1,
"<= bdb_dn2id_children( %s ): %schildren (%d)\n",
dn->bv_val, rc == 0 ? "" : ( rc == DB_NOTFOUND ? "no " :
db_strerror(rc)), rc ));
db_strerror(rc)), rc );
#else
Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_children( %s ): %schildren (%d)\n",
dn->bv_val,
@ -523,8 +518,8 @@ bdb_dn2idl(
DB *db = bdb->bi_dn2id->bdi_db;
#ifdef NEW_LOGGING
LDAP_LOG (( "db2id", LDAP_LEVEL_ARGS,
"=> bdb_dn2ididl( \"%s\" )\n", dn->bv_val ));
LDAP_LOG ( INDEX, ARGS,
"=> bdb_dn2ididl( \"%s\" )\n", dn->bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2idl( \"%s\" )\n", dn->bv_val, 0, 0 );
#endif
@ -547,9 +542,8 @@ bdb_dn2idl(
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "db2id", LDAP_LEVEL_ERR,
"<= bdb_dn2ididl: get failed: %s (%d)\n",
db_strerror(rc), rc ));
LDAP_LOG ( INDEX, ERR,
"<= bdb_dn2ididl: get failed: %s (%d)\n", db_strerror(rc), rc, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"<= bdb_dn2idl: get failed: %s (%d)\n",
@ -558,10 +552,10 @@ bdb_dn2idl(
} else {
#ifdef NEW_LOGGING
LDAP_LOG (( "db2id", LDAP_LEVEL_RESULTS,
LDAP_LOG ( INDEX, RESULTS,
"<= bdb_dn2ididl: id=%ld first=%ld last=%ld\n",
(long) ids[0], (long) BDB_IDL_FIRST( ids ),
(long) BDB_IDL_LAST( ids ) ));
(long) BDB_IDL_LAST( ids ) );
#else
Debug( LDAP_DEBUG_TRACE,
"<= bdb_dn2idl: id=%ld first=%ld last=%ld\n",

2
servers/slapd/back-bdb/error.c
View file

@ -16,7 +16,7 @@
void bdb_errcall( const char *pfx, char * msg )
{
#ifdef NEW_LOGGING
LDAP_LOG (( "error", LDAP_LEVEL_INFO, "bdb(%s): %s\n", pfx, msg ));
LDAP_LOG ( OPERATION, INFO, "bdb(%s): %s\n", pfx, msg, 0 );
#else
Debug( LDAP_DEBUG_ANY, "bdb(%s): %s\n", pfx, msg, 0 );
#endif

133
servers/slapd/back-bdb/filterindex.c
View file

@ -52,7 +52,7 @@ bdb_filter_candidates(
{
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
@ -60,7 +60,7 @@ 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
@ -73,7 +73,7 @@ bdb_filter_candidates(
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
@ -82,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
@ -91,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
@ -100,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
@ -109,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
@ -119,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
@ -129,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
@ -139,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
@ -147,7 +147,7 @@ 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
@ -157,7 +157,7 @@ bdb_filter_candidates(
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
@ -167,7 +167,7 @@ bdb_filter_candidates(
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 %lu\n",
(unsigned long) f->f_choice, 0, 0 );
@ -175,7 +175,9 @@ bdb_filter_candidates(
}
#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",
@ -201,7 +203,7 @@ list_candidates(
Filter *f;
#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
@ -237,7 +239,10 @@ list_candidates(
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",
@ -248,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",
@ -272,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
@ -287,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",
@ -299,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",
@ -310,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",
@ -326,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",
@ -336,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",
@ -365,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
@ -375,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",
@ -386,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 );
@ -414,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",
@ -425,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",
@ -442,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",
@ -453,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",
@ -472,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",
@ -500,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
@ -510,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",
@ -521,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 );
@ -554,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",
@ -565,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",
@ -583,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 );
@ -593,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 );
@ -611,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],
@ -637,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
@ -647,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",
@ -658,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",
@ -688,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",
@ -699,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",
@ -717,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 );
@ -727,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 );
@ -745,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],

51
servers/slapd/back-bdb/group.c
View file

@ -54,9 +54,9 @@ bdb_group(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
LDAP_LOG( BACK_BDB, ENTRY,
"bdb_group: check (%s) member of (%s), oc %s\n",
op_ndn->bv_val, gr_ndn->bv_val, group_oc_name ));
op_ndn->bv_val, gr_ndn->bv_val, group_oc_name );
#else
Debug( LDAP_DEBUG_ARGS,
"=> bdb_group: gr dn: \"%s\"\n",
@ -88,8 +88,8 @@ bdb_group(
/* we already have a LOCKED copy of the entry */
e = target;
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"bdb_group: target is group (%s)\n", gr_ndn->bv_val ));
LDAP_LOG( BACK_BDB, DETAIL1,
"bdb_group: target is group (%s)\n", gr_ndn->bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ARGS,
"=> bdb_group: target is group: \"%s\"\n",
@ -112,9 +112,8 @@ dn2entry_retry:
}
if (e == NULL) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"bdb_group: cannot find group (%s)\n",
gr_ndn->bv_val ));
LDAP_LOG( BACK_BDB, DETAIL1,
"bdb_group: cannot find group (%s)\n", gr_ndn->bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ACL,
"=> bdb_group: cannot find group: \"%s\"\n",
@ -126,8 +125,8 @@ dn2entry_retry:
return( 1 );
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"bdb_group: found group (%s)\n", gr_ndn->bv_val ));
LDAP_LOG( BACK_BDB, DETAIL1,
"bdb_group: found group (%s)\n", gr_ndn->bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ACL,
"=> bdb_group: found group: \"%s\"\n",
@ -144,8 +143,8 @@ dn2entry_retry:
#ifdef BDB_ALIASES
if( is_entry_alias( e ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"bdb_group: group (%s) is an alias\n", gr_ndn->bv_val ));
LDAP_LOG( BACK_BDB, INFO,
"bdb_group: group (%s) is an alias\n", gr_ndn->bv_val, 0, 0);
#else
Debug( LDAP_DEBUG_ACL,
"<= bdb_group: group is an alias\n", 0, 0, 0 );
@ -156,8 +155,8 @@ dn2entry_retry:
if( is_entry_referral( e ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"bdb_group: group (%s) is a referral.\n", gr_ndn->bv_val ));
LDAP_LOG( BACK_BDB, INFO,
"bdb_group: group (%s) is a referral.\n", gr_ndn->bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ACL,
"<= bdb_group: group is a referral\n", 0, 0, 0 );
@ -167,9 +166,9 @@ dn2entry_retry:
if( !is_entry_objectclass( e, group_oc, 0 ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
"bdb_group: failed to find %s in objectClass.\n",
group_oc_name ));
LDAP_LOG( BACK_BDB, ERR,
"bdb_group: failed to find %s in objectClass.\n",
group_oc_name, 0, 0 );
#else
Debug( LDAP_DEBUG_ACL,
"<= bdb_group: failed to find %s in objectClass\n",
@ -180,8 +179,8 @@ dn2entry_retry:
if ((attr = attr_find(e->e_attrs, group_at)) == NULL) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"bdb_group: failed to find %s\n", group_at_name ));
LDAP_LOG( BACK_BDB, INFO,
"bdb_group: failed to find %s\n", group_at_name, 0, 0 );
#else
Debug( LDAP_DEBUG_ACL,
"<= bdb_group: failed to find %s\n",
@ -191,9 +190,9 @@ dn2entry_retry:
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
LDAP_LOG( BACK_BDB, ENTRY,
"bdb_group: found objectClass %s and %s\n",
group_oc_name, group_at_name ));
group_oc_name, group_at_name, 0 );
#else
Debug( LDAP_DEBUG_ACL,
"<= bdb_group: found objectClass %s and %s\n",
@ -202,9 +201,9 @@ dn2entry_retry:
if( value_find( group_at, attr->a_vals, op_ndn ) != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
LDAP_LOG( BACK_BDB, DETAIL1,
"bdb_group: \"%s\" not in \"%s\": %s\n",
op_ndn->bv_val, gr_ndn->bv_val, group_at_name ));
op_ndn->bv_val, gr_ndn->bv_val, group_at_name );
#else
Debug( LDAP_DEBUG_ACL,
"<= bdb_group: \"%s\" not in \"%s\": %s\n",
@ -214,9 +213,8 @@ dn2entry_retry:
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"bdb_group: %s is in %s: %s\n",
op_ndn->bv_val, gr_ndn->bv_val, group_at_name ));
LDAP_LOG( BACK_BDB, DETAIL1, "bdb_group: %s is in %s: %s\n",
op_ndn->bv_val, gr_ndn->bv_val, group_at_name );
#else
Debug( LDAP_DEBUG_ACL,
"<= bdb_group: \"%s\" is in \"%s\": %s\n",
@ -236,8 +234,7 @@ return_results:
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
"bdb_group: rc=%d\n", rc ));
LDAP_LOG( BACK_BDB, ENTRY, "bdb_group: rc=%d\n", rc, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "bdb_group: rc=%d\n", rc, 0, 0 );
#endif

103
servers/slapd/back-bdb/idl.c
View file

@ -36,9 +36,9 @@ static void idl_dump( ID *ids )
{
if( BDB_IDL_IS_RANGE( ids ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_INFO, "IDL: range (%ld - %ld)\n",
LDAP_LOG( INDEX, INFO, "IDL: range (%ld - %ld)\n",
(long) BDB_IDL_RANGE_FIRST( ids ),
(long) BDB_IDL_RANGE_LAST( ids ) ));
(long) BDB_IDL_RANGE_LAST( ids ), 0 );
#else
Debug( LDAP_DEBUG_ANY,
"IDL: range ( %ld - %ld )\n",
@ -49,8 +49,7 @@ static void idl_dump( ID *ids )
} else {
ID i;
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_INFO, "IDL: size %ld",
(long) ids[0] ));
LDAP_LOG( INDEX, INFO, "IDL: size %ld", (long) ids[0], 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "IDL: size %ld", (long) ids[0], 0, 0 );
#endif
@ -60,7 +59,7 @@ static void idl_dump( ID *ids )
Debug( LDAP_DEBUG_ANY, "\n", 0, 0, 0 );
}
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_INFO, "%02lx",(long)ids[i] ));
LDAP_LOG( INDEX, INFO, "%02lx",(long)ids[i], 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, " %02lx", (long) ids[i], 0, 0 );
#endif
@ -139,8 +138,7 @@ int bdb_idl_insert( ID *ids, ID id )
#if IDL_DEBUG > 1
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_DETAIL1, "insert: %04lx at %d\n",
(long) id, x ));
LDAP_LOG( INDEX, DETAIL1, "insert: %04lx at %d\n", (long) id, x, 0 );
#else
Debug( LDAP_DEBUG_ANY, "insert: %04lx at %d\n", (long) id, x, 0 );
idl_dump( ids );
@ -193,8 +191,7 @@ static int idl_delete( ID *ids, ID id )
#if IDL_DEBUG > 1
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_DETAIL1, "delete: %04lx at %d\n",
(long) id, x ));
LDAP_LOG( INDEX, DETAIL1, "delete: %04lx at %d\n", (long) id, x, 0 );
#else
Debug( LDAP_DEBUG_ANY, "delete: %04lx at %d\n", (long) id, x, 0 );
idl_dump( ids );
@ -267,7 +264,9 @@ bdb_idl_fetch_key(
rc = db->cursor( db, tid, &cursor, bdb->bi_db_opflags );
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_fetch_key: cursor failed: %s (%d)\n", db_strerror(rc), rc ));
LDAP_LOG( INDEX, ERR,
"bdb_idl_fetch_key: cursor failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
#else
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_fetch_key: "
"cursor failed: %s (%d)\n", db_strerror(rc), rc, 0 );
@ -296,7 +295,10 @@ bdb_idl_fetch_key(
if (ids[1] == 0) {
if (ids[0] != BDB_IDL_RANGE_SIZE) {
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "=> bdb_idl_fetch_key: range size mismatch: expected %ld, got %ld\n", BDB_IDL_RANGE_SIZE, ids[0] ));
LDAP_LOG( INDEX, ERR,
"=> bdb_idl_fetch_key: range size mismatch: "
"expected %ld, got %ld\n",
BDB_IDL_RANGE_SIZE, ids[0], 0 );
#else
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_fetch_key: "
"range size mismatch: expected %d, got %ld\n",
@ -312,7 +314,9 @@ bdb_idl_fetch_key(
rc2 = cursor->c_close( cursor );
if (rc2) {
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_fetch_key: close failed: %s (%d)\n", db_strerror(rc2), rc2 ));
LDAP_LOG( INDEX, ERR,
"bdb_idl_fetch_key: close failed: %s (%d)\n",
db_strerror(rc2), rc2, 0 );
#else
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_fetch_key: "
"close failed: %s (%d)\n", db_strerror(rc2), rc2, 0 );
@ -333,7 +337,9 @@ bdb_idl_fetch_key(
} else if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_fetch_key: get failed: %s (%d)\n", db_strerror(rc), rc ));
LDAP_LOG( INDEX, ERR,
"bdb_idl_fetch_key: get failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
#else
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_fetch_key: "
"get failed: %s (%d)\n",
@ -344,7 +350,9 @@ bdb_idl_fetch_key(
} else if ( data.size == 0 || data.size % sizeof( ID ) ) {
/* size not multiple of ID size */
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_fetch_key: odd size: expected %ld multiple, got %ld\n", (long) sizeof( ID ), (long) data.size ));
LDAP_LOG( INDEX, ERR,
"bdb_idl_fetch_key: odd size: expected %ld multiple, got %ld\n",
(long) sizeof( ID ), (long) data.size, 0 );
#else
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_fetch_key: "
"odd size: expected %ld multiple, got %ld\n",
@ -355,7 +363,9 @@ bdb_idl_fetch_key(
} else if ( data.size != BDB_IDL_SIZEOF(ids) ) {
/* size mismatch */
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_fetch_key: get size mismatch: expected %ld, got %ld\n", (long) ((1 + ids[0]) * sizeof( ID )), (long) data.size ));
LDAP_LOG( INDEX, ERR,
"bdb_idl_fetch_key: get size mismatch: expected %ld, got %ld\n",
(long) ((1 + ids[0]) * sizeof( ID )), (long) data.size, 0 );
#else
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_fetch_key: "
"get size mismatch: expected %ld, got %ld\n",
@ -385,7 +395,8 @@ bdb_idl_insert_key(
#if 0
/* for printable keys only */
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_ARGS, "bdb_idl_insert_key: %s %ld\n", (char *)key->data, (long) id ));
LDAP_LOG( INDEX, ARGS, "bdb_idl_insert_key: %s %ld\n",
(char *)key->data, (long) id, 0 );
#else
Debug( LDAP_DEBUG_ARGS,
"=> bdb_idl_insert_key: %s %ld\n",
@ -409,7 +420,9 @@ bdb_idl_insert_key(
rc = db->cursor( db, tid, &cursor, bdb->bi_db_opflags );
if ( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_insert_key: cursor failed: %s (%d)\n", db_strerror(rc), rc ));
LDAP_LOG( INDEX, ERR,
"bdb_idl_insert_key: cursor failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
#else
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_insert_key: "
"cursor failed: %s (%d)\n", db_strerror(rc), rc, 0 );
@ -518,7 +531,9 @@ put1: data.data = &id;
/* initial c_get failed, nothing was done */
fail:
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_insert_key: %s failed: %s (%d)\n", err, db_strerror(rc), rc ));
LDAP_LOG( INDEX, ERR,
"bdb_idl_insert_key: %s failed: %s (%d)\n",
err, db_strerror(rc), rc );
#else
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_insert_key: "
"%s failed: %s (%d)\n", err, db_strerror(rc), rc );
@ -543,7 +558,8 @@ fail:
} else if ( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_insert_key: get failed: %s (%d)\n", db_strerror(rc), rc ));
LDAP_LOG( INDEX, ERR, "bdb_idl_insert_key: get failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
#else
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_insert_key: "
"get failed: %s (%d)\n",
@ -554,7 +570,9 @@ fail:
} else if ( data.size == 0 || data.size % sizeof( ID ) ) {
/* size not multiple of ID size */
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_insert_key: odd size: expected %ld multiple, got %ld\n", (long) sizeof( ID ), (long) data.size ));
LDAP_LOG( INDEX, ERR,
"bdb_idl_insert_key: odd size: expected %ld multiple, got %ld\n",
(long) sizeof( ID ), (long) data.size, 0 );
#else
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_insert_key: "
"odd size: expected %ld multiple, got %ld\n",
@ -565,7 +583,9 @@ fail:
} else if ( data.size != BDB_IDL_SIZEOF(ids) ) {
/* size mismatch */
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_insert_key: odd size: expected %ld multiple, got %ld\n", (long) ((1 + ids[0]) * sizeof( ID )), (long) data.size ));
LDAP_LOG( INDEX, ERR,
"bdb_idl_insert_key: odd size: expected %ld multiple, got %ld\n",
(long) ((1 + ids[0]) * sizeof( ID )), (long) data.size, 0 );
#else
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_insert_key: "
"get size mismatch: expected %ld, got %ld\n",
@ -587,7 +607,7 @@ fail:
if( rc == -1 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_DETAIL1, "bdb_idl_insert_key: dup\n" ));
LDAP_LOG( INDEX, DETAIL1, "bdb_idl_insert_key: dup\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "=> bdb_idl_insert_key: dup\n",
0, 0, 0 );
@ -596,7 +616,8 @@ fail:
}
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_insert_key: insert failed: (%d)\n", rc ));
LDAP_LOG( INDEX, ERR,
"bdb_idl_insert_key: insert failed: (%d)\n", rc, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_insert_key: "
"bdb_idl_insert failed (%d)\n",
@ -616,7 +637,9 @@ fail:
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_insert_key: put failed: (%d)\n", db_strerror(rc), rc ));
LDAP_LOG( INDEX, ERR,
"bdb_idl_insert_key: put failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
#else
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_insert_key: "
"put failed: %s (%d)\n",
@ -644,7 +667,8 @@ bdb_idl_delete_key(
#if 0
/* for printable keys only */
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_ARGS, "bdb_idl_delete_key: %s %ld\n", (char *)key->data, (long) id ));
LDAP_LOG( INDEX, ARGS, "bdb_idl_delete_key: %s %ld\n",
(char *)key->data, (long) id, 0 );
#else
Debug( LDAP_DEBUG_ARGS,
"=> bdb_idl_delete_key: %s %ld\n",
@ -669,7 +693,9 @@ bdb_idl_delete_key(
rc = db->cursor( db, tid, &cursor, bdb->bi_db_opflags );
if ( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_delete_key: cursor failed: %s (%d)\n", db_strerror(rc), rc ));
LDAP_LOG( INDEX, ERR,
"bdb_idl_delete_key: cursor failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
#else
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_delete_key: "
"cursor failed: %s (%d)\n", db_strerror(rc), rc, 0 );
@ -752,7 +778,9 @@ bdb_idl_delete_key(
/* initial c_get failed, nothing was done */
fail:
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_delete_key: %s failed: %s (%d)\n", err, db_strerror(rc), rc ));
LDAP_LOG( INDEX, ERR,
"bdb_idl_delete_key: %s failed: %s (%d)\n",
err, db_strerror(rc), rc );
#else
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_delete_key: "
"%s failed: %s (%d)\n", err, db_strerror(rc), rc );
@ -772,7 +800,8 @@ fail:
if ( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_delete_key: get failed: %s (%d)\n", db_strerror(rc), rc ));
LDAP_LOG( INDEX, ERR, "bdb_idl_delete_key: get failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
#else
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_delete_key: "
"get failed: %s (%d)\n",
@ -783,7 +812,9 @@ fail:
} else if ( data.size == 0 || data.size % sizeof( ID ) ) {
/* size not multiple of ID size */
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_delete_key: odd size: expected: %ld multiple, got %ld\n", (long) sizeof( ID ), (long) data.size ));
LDAP_LOG( INDEX, ERR,
"bdb_idl_delete_key: odd size: expected: %ld multiple, got %ld\n",
(long) sizeof( ID ), (long) data.size, 0 );
#else
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_delete_key: "
"odd size: expected %ld multiple, got %ld\n",
@ -797,7 +828,9 @@ fail:
} else if ( data.size != (1 + ids[0]) * sizeof( ID ) ) {
/* size mismatch */
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_delete_key: get size mismatch: expected: %ld, got %ld\n", (long) ((1 + ids[0]) * sizeof( ID )), (long) data.size ));
LDAP_LOG( INDEX, ERR,
"bdb_idl_delete_key: get size mismatch: expected: %ld, got %ld\n",
(long) ((1 + ids[0]) * sizeof( ID )), (long) data.size, 0 );
#else
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_delete_key: "
"get size mismatch: expected %ld, got %ld\n",
@ -810,7 +843,8 @@ fail:
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_delete_key: delete failed: (%d)\n", rc ));
LDAP_LOG( INDEX, ERR,
"bdb_idl_delete_key: delete failed: (%d)\n", rc, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_delete_key: "
"idl_delete failed (%d)\n",
@ -824,7 +858,9 @@ fail:
rc = db->del( db, tid, key, 0 );
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_delete_key: delete failed: %s (%d)\n", db_strerror(rc), rc ));
LDAP_LOG( INDEX, ERR,
"bdb_idl_delete_key: delete failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
#else
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_delete_key: "
"delete failed: %s (%d)\n",
@ -844,7 +880,8 @@ fail:
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_delete_key: put failed: %s (%d)\n", db_strerror(rc), rc ));
LDAP_LOG( INDEX, ERR, "bdb_idl_delete_key: put failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"=> bdb_idl_delete_key: put failed: %s (%d)\n",

17
servers/slapd/back-bdb/index.c
View file

@ -168,8 +168,8 @@ static int indexer(
if ( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "index", LDAP_LEVEL_ERR,
"bdb_index_read: Could not open DB %s\n", dbname));
LDAP_LOG( INDEX, ERR,
"bdb_index_read: Could not open DB %s\n", dbname, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"<= bdb_index_read NULL (could not open %s)\n",
@ -345,10 +345,8 @@ bdb_index_entry(
int rc;
#ifdef NEW_LOGGING
LDAP_LOG(( "index", LDAP_LEVEL_ENTRY,
"index_entry: %s (%s) %ld\n",
op == SLAP_INDEX_ADD_OP ? "add" : "del",
e->e_dn, (long) e->e_id ));
LDAP_LOG( INDEX, ENTRY, "index_entry: %s (%s) %ld\n",
op == SLAP_INDEX_ADD_OP ? "add" : "del", e->e_dn, (long) e->e_id );
#else
Debug( LDAP_DEBUG_TRACE, "=> index_entry_%s( %ld, \"%s\" )\n",
op == SLAP_INDEX_ADD_OP ? "add" : "del",
@ -362,8 +360,8 @@ bdb_index_entry(
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "index", LDAP_LEVEL_ENTRY,
"index_entry: failure (%d)\n", rc ));
LDAP_LOG( INDEX, ENTRY,
"index_entry: failure (%d)\n", rc, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"<= index_entry_%s( %ld, \"%s\" ) failure\n",
@ -375,8 +373,7 @@ bdb_index_entry(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "index", LDAP_LEVEL_ENTRY,
"index_entry: success\n" ));
LDAP_LOG( INDEX, ENTRY, "index_entry: success\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "<= index_entry_%s( %ld, \"%s\" ) success\n",
op == SLAP_INDEX_ADD_OP ? "add" : "del",

64
servers/slapd/back-bdb/init.c
View file

@ -61,7 +61,7 @@ bdb_db_init( BackendDB *be )
struct bdb_info *bdb;
#ifdef NEW_LOGGING
LDAP_LOG(( "init", LDAP_LEVEL_ENTRY, "bdb_db_init" ));
LDAP_LOG( BACK_BDB, ENTRY, "bdb_db_init", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"bdb_db_init: Initializing BDB database\n",
@ -126,7 +126,8 @@ static void *lock_detect_task( void *arg )
}
#ifdef NEW_LOGGING
LDAP_LOG(( "init", LDAP_LEVEL_ERR, "bdb_db_init: aborted %d locks\n", aborted ));
LDAP_LOG( BACK_BDB, ERR, "bdb_db_init: aborted %d locks\n",
aborted, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"bdb_lock_detect: aborted %d locks\n",
@ -171,7 +172,8 @@ bdb_db_open( BackendDB *be )
u_int32_t flags;
#ifdef NEW_LOGGING
LDAP_LOG(( "init", LDAP_LEVEL_ARGS, "bdb_db_open: %s\n", be->be_suffix[0].bv_val ));
LDAP_LOG( BACK_BDB, ARGS,
"bdb_db_open: %s\n", be->be_suffix[0].bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ARGS,
"bdb_db_open: %s\n",
@ -183,7 +185,9 @@ bdb_db_open( BackendDB *be )
rc = db_env_create( &bdb->bi_dbenv, 0 );
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "init", LDAP_LEVEL_ERR, "bdb_db_open: db_env_create failed: %s (%d)\n", db_strerror(rc), rc ));
LDAP_LOG( BACK_BDB, ERR,
"bdb_db_open: db_env_create failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"bdb_db_open: db_env_create failed: %s (%d)\n",
@ -212,7 +216,9 @@ bdb_db_open( BackendDB *be )
rc = bdb->bi_dbenv->set_tmp_dir( bdb->bi_dbenv, dir );
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "init", LDAP_LEVEL_ERR, "bdb_db_open: set_tmp_dir(%s) failed: %s (%d)\n", dir, db_strerror(rc), rc ));
LDAP_LOG( BACK_BDB, ERR,
"bdb_db_open: set_tmp_dir(%s) failed: %s (%d)\n",
dir, db_strerror(rc), rc );
#else
Debug( LDAP_DEBUG_ANY,
"bdb_db_open: set_tmp_dir(%s) failed: %s (%d)\n",
@ -226,7 +232,9 @@ bdb_db_open( BackendDB *be )
rc = bdb->bi_dbenv->set_lg_dir( bdb->bi_dbenv, dir );
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "init", LDAP_LEVEL_ERR, "bdb_db_open: set_lg_dir(%s) failed: %s (%d)\n", dir, db_strerror(rc), rc ));
LDAP_LOG( BACK_BDB, ERR,
"bdb_db_open: set_lg_dir(%s) failed: %s (%d)\n",
dir, db_strerror(rc), rc );
#else
Debug( LDAP_DEBUG_ANY,
"bdb_db_open: set_lg_dir(%s) failed: %s (%d)\n",
@ -240,7 +248,9 @@ bdb_db_open( BackendDB *be )
rc = bdb->bi_dbenv->set_data_dir( bdb->bi_dbenv, dir );
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "init", LDAP_LEVEL_ERR, "bdb_db_open: set_data_dir(%s) failed: %s (%d)\n", dir, db_strerror(rc), rc ));
LDAP_LOG( BACK_BDB, ERR,
"bdb_db_open: set_data_dir(%s) failed: %s (%d)\n",
dir, db_strerror(rc), rc );
#else
Debug( LDAP_DEBUG_ANY,
"bdb_db_open: set_data_dir(%s) failed: %s (%d)\n",
@ -252,7 +262,8 @@ bdb_db_open( BackendDB *be )
#endif
#ifdef NEW_LOGGING
LDAP_LOG(( "init", LDAP_LEVEL_DETAIL1, "bdb_db_open: dbenv_open %s\n", bdb->bi_dbenv_home ));
LDAP_LOG( BACK_BDB, DETAIL1,
"bdb_db_open: dbenv_open %s\n", bdb->bi_dbenv_home, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_db_open: dbenv_open(%s)\n",
@ -265,7 +276,9 @@ bdb_db_open( BackendDB *be )
bdb->bi_dbenv_mode );
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "init", LDAP_LEVEL_ERR, "bdb_db_open: dbenv_open failed: %s (%d)\n", db_strerror(rc), rc ));
LDAP_LOG( BACK_BDB, ERR,
"bdb_db_open: dbenv_open failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"bdb_db_open: dbenv_open failed: %s (%d)\n",
@ -279,7 +292,9 @@ bdb_db_open( BackendDB *be )
bdb->bi_dbenv_xflags, 1);
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "init", LDAP_LEVEL_ERR, "bdb_db_open: dbenv_set_flags failed: %s (%d)\n", db_strerror(rc), rc ));
LDAP_LOG( BACK_BDB, ERR,
"bdb_db_open: dbenv_set_flags failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"bdb_db_open: dbenv_set_flags failed: %s (%d)\n",
@ -303,7 +318,9 @@ bdb_db_open( BackendDB *be )
rc = db_create( &db->bdi_db, bdb->bi_dbenv, 0 );
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "init", LDAP_LEVEL_ERR, "bdb_db_open: db_create(%s) failed: %s (%d)\n", bdb->bi_dbenv_home, db_strerror(rc), rc ));
LDAP_LOG( BACK_BDB, ERR,
"bdb_db_open: db_create(%s) failed: %s (%d)\n",
bdb->bi_dbenv_home, db_strerror(rc), rc );
#else
Debug( LDAP_DEBUG_ANY,
"bdb_db_open: db_create(%s) failed: %s (%d)\n",
@ -340,7 +357,9 @@ bdb_db_open( BackendDB *be )
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "init", LDAP_LEVEL_ERR, "bdb_db_open: db_create(%s) failed: %s (%d)\n", bdb->bi_dbenv_home, db_strerror(rc), rc ));
LDAP_LOG( BACK_BDB, ERR,
"bdb_db_open: db_create(%s) failed: %s (%d)\n",
bdb->bi_dbenv_home, db_strerror(rc), rc );
#else
Debug( LDAP_DEBUG_ANY,
"bdb_db_open: db_open(%s) failed: %s (%d)\n",
@ -360,7 +379,9 @@ bdb_db_open( BackendDB *be )
rc = bdb_last_id( be, NULL );
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "init", LDAP_LEVEL_ERR, "bdb_db_open: last_id(%s) failed: %s (%d)\n", bdb->bi_dbenv_home, db_strerror(rc), rc ));
LDAP_LOG( BACK_BDB, ERR,
"bdb_db_open: last_id(%s) failed: %s (%d)\n",
bdb->bi_dbenv_home, db_strerror(rc), rc );
#else
Debug( LDAP_DEBUG_ANY,
"bdb_db_open: last_id(%s) failed: %s (%d)\n",
@ -419,7 +440,9 @@ bdb_db_destroy( BackendDB *be )
rc = TXN_CHECKPOINT( bdb->bi_dbenv, 0, 0, DB_FORCE );
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "init", LDAP_LEVEL_ERR, "bdb_db_destroy: txn_checkpoint failed: %s (%d)\n", db_strerror(rc), rc ));
LDAP_LOG( BACK_BDB, ERR,
"bdb_db_destroy: txn_checkpoint failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"bdb_db_destroy: txn_checkpoint failed: %s (%d)\n",
@ -433,7 +456,9 @@ bdb_db_destroy( BackendDB *be )
bdb->bi_dbenv = NULL;
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "init", LDAP_LEVEL_ERR, "bdb_db_destroy: close failed: %s (%d)\n", db_strerror(rc), rc ));
LDAP_LOG( BACK_BDB, ERR,
"bdb_db_destroy: close failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"bdb_db_destroy: close failed: %s (%d)\n",
@ -490,7 +515,7 @@ bdb_initialize(
/* initialize the underlying database system */
#ifdef NEW_LOGGING
LDAP_LOG(( "init", LDAP_LEVEL_ENTRY, "bdb_db_initialize\n" ));
LDAP_LOG( BACK_BDB, ENTRY, "bdb_db_initialize\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "bdb_open: initialize BDB backend\n",
0, 0, 0 );
@ -505,7 +530,9 @@ bdb_initialize(
patch < DB_VERSION_PATCH )
{
#ifdef NEW_LOGGING
LDAP_LOG(( "init", LDAP_LEVEL_ERR, "bdb_db_initialize: version mismatch: \texpected: %s \tgot: %s\n", DB_VERSION_STRING, version ));
LDAP_LOG( BACK_BDB, ERR,
"bdb_db_initialize: version mismatch: "
"\texpected: %s \tgot: %s\n", DB_VERSION_STRING, version, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"bdb_open: version mismatch\n"
@ -515,7 +542,8 @@ bdb_initialize(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "init", LDAP_LEVEL_DETAIL1, "bdb_db_initialize: bdb_open: %s\n", version ));
LDAP_LOG( BACK_BDB, DETAIL1,
"bdb_db_initialize: bdb_open: %s\n", version, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "bdb_open: %s\n",
version, 0, 0 );

19
servers/slapd/back-bdb/key.c
View file

@ -30,8 +30,7 @@ bdb_key_read(
DBT key;
#ifdef NEW_LOGGING
LDAP_LOG(( "index", LDAP_LEVEL_ENTRY,
"key_read: enter\n" ));
LDAP_LOG( INDEX, ENTRY, "key_read: enter\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "=> key_read\n", 0, 0, 0 );
#endif
@ -45,17 +44,15 @@ bdb_key_read(
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "index", LDAP_LEVEL_ERR,
"bdb_key_read: failed (%d)\n",
rc ));
LDAP_LOG( INDEX, ERR, "bdb_key_read: failed (%d)\n", rc, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "<= bdb_index_read: failed (%d)\n",
rc, 0, 0 );
#endif
} else {
#ifdef NEW_LOGGING
LDAP_LOG(( "index", LDAP_LEVEL_DETAIL1,
"bdb_key_read: %ld candidates\n", (long) BDB_IDL_N(ids) ));
LDAP_LOG( INDEX, DETAIL1,
"bdb_key_read: %ld candidates\n", (long)BDB_IDL_N(ids), 0, 0);
#else
Debug( LDAP_DEBUG_TRACE, "<= bdb_index_read %ld candidates\n",
(long) BDB_IDL_N(ids), 0, 0 );
@ -80,9 +77,8 @@ bdb_key_change(
DBT key;
#ifdef NEW_LOGGING
LDAP_LOG(( "index", LDAP_LEVEL_DETAIL1,
"key_change: %s ID %lx\n",
op == SLAP_INDEX_ADD_OP ? "Add" : "Delete", (long) id ));
LDAP_LOG( INDEX, ENTRY, "key_change: %s ID %lx\n",
op == SLAP_INDEX_ADD_OP ? "Add" : "Delete", (long) id, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "=> key_change(%s,%lx)\n",
op == SLAP_INDEX_ADD_OP ? "ADD":"DELETE", (long) id, 0 );
@ -103,8 +99,7 @@ bdb_key_change(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "index", LDAP_LEVEL_RESULTS,
"key_change: return %d\n", rc ));
LDAP_LOG( INDEX, RESULTS, "key_change: return %d\n", rc, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "<= key_change %d\n", rc, 0, 0 );
#endif

70
servers/slapd/back-bdb/modify.c
View file

@ -32,7 +32,8 @@ int bdb_modify_internal(
Attribute *ap;
#ifdef NEW_LOGGING
LDAP_LOG (( "modify", LDAP_LEVEL_ENTRY,"bdb_modify_internal: 0x%08lx: %s\n", e->e_id, e->e_dn ));
LDAP_LOG ( OPERATION, ENTRY, "bdb_modify_internal: 0x%08lx: %s\n",
e->e_id, e->e_dn, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "bdb_modify_internal: 0x%08lx: %s\n",
e->e_id, e->e_dn, 0);
@ -51,14 +52,15 @@ 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" ));
LDAP_LOG ( OPERATION, DETAIL1, "bdb_modify_internal: add\n", 0,0,0);
#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 ));
LDAP_LOG ( OPERATION, ERR,
"bdb_modify_internal: %d %s\n", err, *text, 0 );
#else
Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
err, *text, 0);
@ -68,7 +70,8 @@ int bdb_modify_internal(
case LDAP_MOD_DELETE:
#ifdef NEW_LOGGING
LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify_internal: delete\n" ));
LDAP_LOG ( OPERATION, DETAIL1,
"bdb_modify_internal: delete\n", 0, 0, 0 );
#else
Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: delete\n", 0, 0, 0);
#endif
@ -76,7 +79,8 @@ int bdb_modify_internal(
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 ));
LDAP_LOG ( OPERATION, ERR,
"bdb_modify_internal: %d %s\n", err, *text, 0 );
#else
Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
err, *text, 0);
@ -86,14 +90,16 @@ int bdb_modify_internal(
case LDAP_MOD_REPLACE:
#ifdef NEW_LOGGING
LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify_internal: replace\n" ));
LDAP_LOG ( OPERATION, DETAIL1,
"bdb_modify_internal: replace\n", 0, 0, 0 );
#else
Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: replace\n", 0, 0, 0);
#endif
err = modify_replace_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 ));
LDAP_LOG ( OPERATION, ERR,
"bdb_modify_internal: %d %s\n", err, *text, 0 );
#else
Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
err, *text, 0);
@ -103,7 +109,8 @@ int bdb_modify_internal(
case SLAP_MOD_SOFTADD:
#ifdef NEW_LOGGING
LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify_internal: softadd\n" ));
LDAP_LOG ( OPERATION, DETAIL1,
"bdb_modify_internal: softadd\n",0,0,0 );
#else
Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: softadd\n", 0, 0, 0);
#endif
@ -119,7 +126,8 @@ 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 ));
LDAP_LOG ( OPERATION, ERR,
"bdb_modify_internal: %d %s\n", err, *text, 0 );
#else
Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
err, *text, 0);
@ -129,7 +137,8 @@ int bdb_modify_internal(
default:
#ifdef NEW_LOGGING
LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: invalid op %d\n", mod->sm_op ));
LDAP_LOG ( OPERATION, ERR,
"bdb_modify_internal: invalid op %d\n", mod->sm_op, 0, 0 );
#else
Debug(LDAP_DEBUG_ANY, "bdb_modify_internal: invalid op %d\n",
mod->sm_op, 0, 0);
@ -137,7 +146,8 @@ int bdb_modify_internal(
*text = "Invalid modify operation";
err = LDAP_OTHER;
#ifdef NEW_LOGGING
LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: %d %s\n", err, *text ));
LDAP_LOG ( OPERATION, ERR,
"bdb_modify_internal: %d %s\n", err, *text, 0 );
#else
Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
err, *text, 0);
@ -173,7 +183,9 @@ int bdb_modify_internal(
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 ));
LDAP_LOG ( OPERATION, ERR,
"bdb_modify_internal: entry failed schema check %s\n",
*text, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "entry failed schema check: %s\n",
*text, 0, 0 );
@ -192,7 +204,9 @@ int bdb_modify_internal(
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" ));
LDAP_LOG ( OPERATION, ERR,
"bdb_modify_internal: attribute index delete failure\n",
0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"Attribute index delete failure",
@ -213,7 +227,9 @@ int bdb_modify_internal(
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" ));
LDAP_LOG ( OPERATION, ERR,
"bdb_modify_internal: attribute index add failure\n",
0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"Attribute index add failure",
@ -253,7 +269,7 @@ bdb_modify(
DB_LOCK lock;
#ifdef NEW_LOGGING
LDAP_LOG (( "modify", LDAP_LEVEL_ENTRY, "bdb_modify: %s\n", dn->bv_val ));
LDAP_LOG ( OPERATION, ENTRY, "bdb_modify: %s\n", dn->bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ARGS, "bdb_modify: %s\n", dn->bv_val, 0, 0 );
#endif
@ -265,7 +281,7 @@ retry: /* transaction retry */
bdb_unlocked_cache_return_entry_w(&bdb->bi_cache, e);
}
#ifdef NEW_LOGGING
LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify: retrying...\n" ));
LDAP_LOG ( OPERATION, DETAIL1, "bdb_modify: retrying...\n", 0, 0, 0 );
#else
Debug(LDAP_DEBUG_TRACE,
"bdb_modify: retrying...\n", 0, 0, 0);
@ -287,7 +303,8 @@ retry: /* transaction retry */
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 ));
LDAP_LOG ( OPERATION, DETAIL1,
"bdb_modify: txn_begin failed: %s (%d)\n", db_strerror(rc), rc, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modify: txn_begin failed: %s (%d)\n",
@ -310,7 +327,8 @@ retry: /* transaction retry */
if ( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify: dn2entry failed: (%d)\n", rc ));
LDAP_LOG ( OPERATION, DETAIL1,
"bdb_modify: dn2entry failed: (%d)\n", rc, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modify: dn2entry failed (%d)\n",
@ -365,7 +383,7 @@ retry: /* transaction retry */
conn, op, e );
#ifdef NEW_LOGGING
LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify: entry is referral\n" ));
LDAP_LOG ( OPERATION, DETAIL1, "bdb_modify: entry is referral\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modify: entry is referral\n",
@ -385,7 +403,8 @@ retry: /* transaction retry */
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify: modify failed (%d)\n", rc ));
LDAP_LOG ( OPERATION, ERR,
"bdb_modify: modify failed (%d)\n", rc, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modify: modify failed (%d)\n",
@ -403,7 +422,8 @@ retry: /* transaction retry */
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 ));
LDAP_LOG ( OPERATION, ERR,
"bdb_modify: id2entry update failed (%d)\n", rc, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modify: id2entry update failed (%d)\n",
@ -428,7 +448,9 @@ retry: /* transaction retry */
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 ));
LDAP_LOG ( OPERATION, 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",
@ -440,7 +462,9 @@ retry: /* transaction retry */
} 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 ));
LDAP_LOG ( OPERATION, 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",

124
servers/slapd/back-bdb/modrdn.c
View file

@ -60,9 +60,8 @@ bdb_modrdn(
DB_LOCK lock;
#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" ));
LDAP_LOG ( OPERATION, 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,
@ -90,7 +89,7 @@ retry: /* transaction retry */
bdb_unlocked_cache_return_entry_r(&bdb->bi_cache, np);
}
#ifdef NEW_LOGGING
LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "==>bdb_modrdn: retrying...\n"));
LDAP_LOG ( OPERATION, DETAIL1, "==>bdb_modrdn: retrying...\n", 0, 0, 0);
#else
Debug( LDAP_DEBUG_TRACE, "==>bdb_modrdn: retrying...\n", 0, 0, 0 );
#endif
@ -111,7 +110,9 @@ retry: /* transaction retry */
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 ));
LDAP_LOG ( OPERATION, ERR,
"==>bdb_modrdn: txn_begin failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_delete: txn_begin failed: %s (%d)\n",
@ -181,7 +182,8 @@ retry: /* transaction retry */
conn, op, e );
#ifdef NEW_LOGGING
LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "==>bdb_modrdn: entry %s is referral \n", e->e_dn ));
LDAP_LOG ( OPERATION, DETAIL1,
"==>bdb_modrdn: entry %s is referral \n", e->e_dn, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "bdb_modrdn: entry %s is referral\n",
e->e_dn, 0, 0 );
@ -224,7 +226,8 @@ retry: /* transaction retry */
if( p == NULL) {
#ifdef NEW_LOGGING
LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "==>bdb_modrdn: parent does not exist\n" ));
LDAP_LOG ( OPERATION, ERR,
"==>bdb_modrdn: parent does not exist\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "bdb_modrdn: parent does not exist\n",
0, 0, 0);
@ -238,7 +241,8 @@ retry: /* transaction retry */
children, NULL, ACL_WRITE, NULL ) )
{
#ifdef NEW_LOGGING
LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "==>bdb_modrdn: no access to parent\n" ));
LDAP_LOG ( OPERATION, ERR,
"==>bdb_modrdn: no access to parent\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "no access to parent\n", 0,
0, 0 );
@ -249,7 +253,8 @@ retry: /* transaction retry */
}
#ifdef NEW_LOGGING
LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "==>bdb_modrdn: wr to children %s is OK\n", p_ndn.bv_val ));
LDAP_LOG ( OPERATION, DETAIL1,
"==>bdb_modrdn: wr to children %s is OK\n", p_ndn.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: wr to children of entry %s OK\n",
@ -263,7 +268,8 @@ retry: /* transaction retry */
}
#ifdef NEW_LOGGING
LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "==>bdb_modrdn: parent dn=%s\n", p_dn.bv_val ));
LDAP_LOG ( OPERATION, DETAIL1,
"==>bdb_modrdn: parent dn=%s\n", p_dn.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: parent dn=%s\n",
@ -288,7 +294,8 @@ retry: /* transaction retry */
if ( ! rc )
{
#ifdef NEW_LOGGING
LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "==>bdb_modrdn: no access to parent\n" ));
LDAP_LOG ( OPERATION, ERR,
"==>bdb_modrdn: no access to parent\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"no access to parent\n",
@ -301,7 +308,9 @@ retry: /* transaction retry */
}
#ifdef NEW_LOGGING
LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "==>bdb_modrdn: wr to children of entry \"\" OK\n", p_dn.bv_val ));
LDAP_LOG ( OPERATION, DETAIL1,
"==>bdb_modrdn: wr to children of entry \"%s\" OK\n",
p_dn.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: wr to children of entry \"\" OK\n",
@ -312,7 +321,8 @@ retry: /* transaction retry */
p_dn.bv_len = 0;
#ifdef NEW_LOGGING
LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "==>bdb_modrdn: parent dn=\"\" \n" ));
LDAP_LOG ( OPERATION, DETAIL1,
"==>bdb_modrdn: parent dn=\"\" \n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: parent dn=\"\"\n",
@ -321,7 +331,9 @@ retry: /* transaction retry */
} else {
#ifdef NEW_LOGGING
LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "==>bdb_modrdn: no parent, not root &\"\" is not suffix\n" ));
LDAP_LOG ( OPERATION, ERR,
"==>bdb_modrdn: no parent, not root &\"\" is not "
"suffix\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: no parent, not root "
@ -338,7 +350,9 @@ retry: /* transaction retry */
if ( newSuperior != NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "==>bdb_modrdn: new parent \"%s\" requested...\n", newSuperior->bv_val ));
LDAP_LOG ( OPERATION, DETAIL1,
"==>bdb_modrdn: new parent \"%s\" requested...\n",
newSuperior->bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: new parent \"%s\" requested...\n",
@ -373,7 +387,9 @@ 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 ));
LDAP_LOG ( OPERATION, DETAIL1,
"==>bdb_modrdn: newSup(ndn=%s) not here!\n",
np_ndn->bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: newSup(ndn=%s) not here!\n",
@ -384,7 +400,9 @@ retry: /* transaction retry */
}
#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 ));
LDAP_LOG ( OPERATION, DETAIL1,
"==>bdb_modrdn: wr to new parent OK np=%p, id=%ld\n",
np, (long) np->e_id, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: wr to new parent OK np=%p, id=%ld\n",
@ -394,7 +412,8 @@ retry: /* transaction retry */
/* 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" ));
LDAP_LOG ( OPERATION, DETAIL1,
"==>bdb_modrdn: no wr to newSup children\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: no wr to newSup children\n",
@ -408,7 +427,8 @@ retry: /* transaction retry */
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" ));
LDAP_LOG ( OPERATION, DETAIL1,
"==>bdb_modrdn: entry is alias\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "bdb_modrdn: entry is alias\n",
0, 0, 0 );
@ -422,7 +442,8 @@ 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" ));
LDAP_LOG ( OPERATION, DETAIL1,
"==>bdb_modrdn: entry is referral\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "bdb_modrdn: entry is referral\n",
0, 0, 0 );
@ -454,7 +475,8 @@ retry: /* transaction retry */
if ( ! rc )
{
#ifdef NEW_LOGGING
LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "==>bdb_modrdn: no access to superior\n" ));
LDAP_LOG ( OPERATION, ERR,
"==>bdb_modrdn: no access to superior\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"no access to new superior\n",
@ -467,7 +489,8 @@ retry: /* transaction retry */
}
#ifdef NEW_LOGGING
LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "bdb_modrdn: wr to children entry \"\" OK\n" ));
LDAP_LOG ( OPERATION, DETAIL1,
"bdb_modrdn: wr to children entry \"\" OK\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: wr to children of entry \"\" OK\n",
@ -476,7 +499,9 @@ retry: /* transaction retry */
} else {
#ifdef NEW_LOGGING
LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "bdb_modrdn: new superior=\"\", not root & \"\" is not suffix\n" ));
LDAP_LOG ( OPERATION, ERR,
"bdb_modrdn: new superior=\"\", not root & \"\" "
"is not suffix\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: new superior=\"\", not root "
@ -489,7 +514,8 @@ retry: /* transaction retry */
}
#ifdef NEW_LOGGING
LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "bdb_modrdn: new superior=\"\"\n" ));
LDAP_LOG ( OPERATION, DETAIL1,
"bdb_modrdn: new superior=\"\"\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: new superior=\"\"\n",
@ -498,7 +524,8 @@ retry: /* transaction retry */
}
#ifdef NEW_LOGGING
LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "bdb_modrdn: wr to new parent's children OK\n" ));
LDAP_LOG ( OPERATION, DETAIL1,
"bdb_modrdn: wr to new parent's children OK\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: wr to new parent's children OK\n",
@ -514,7 +541,8 @@ 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 ));
LDAP_LOG ( OPERATION, RESULTS,
"bdb_modrdn: new ndn=%s\n", new_ndn.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "bdb_modrdn: new ndn=%s\n",
new_ndn.bv_val, 0, 0 );
@ -537,7 +565,8 @@ retry: /* transaction retry */
}
#ifdef NEW_LOGGING
LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "bdb_modrdn: new ndn=%s does not exist\n", new_ndn.bv_val ));
LDAP_LOG ( OPERATION, ERR,
"bdb_modrdn: new ndn=%s does not exist\n", new_ndn.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: new ndn=%s does not exist\n",
@ -551,7 +580,9 @@ retry: /* transaction retry */
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" ));
LDAP_LOG ( OPERATION, ERR,
"bdb_modrdn: can't figure out type(s)/values(s) of newrdn\n",
0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: can't figure out type(s)/values(s) "
@ -563,7 +594,9 @@ retry: /* transaction retry */
}
#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 ));
LDAP_LOG ( OPERATION, 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, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: new_rdn_type=\"%s\", new_rdn_val=\"%s\"\n",
@ -574,7 +607,9 @@ retry: /* transaction retry */
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" ));
LDAP_LOG ( OPERATION, ERR,
"bdb_modrdn: can't figure out type(s)/values(s) of old_rdn\n",
0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_back_modrdn: can't figure out the old_rdn "
@ -591,7 +626,9 @@ retry: /* transaction retry */
( 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 ] ));
LDAP_LOG ( OPERATION, 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 ], 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: old_rdn_type(s)=%s, new_rdn_type(s)=%s "
@ -611,7 +648,8 @@ retry: /* transaction retry */
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 ));
LDAP_LOG ( OPERATION, ERR, "bdb_modrdn: %s: %s (new)\n",
text, new_rdn[0][a_cnt]->la_attr.bv_val, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: %s: %s (new)\n",
@ -624,7 +662,9 @@ retry: /* transaction retry */
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 ));
LDAP_LOG ( OPERATION, ERR,
"bdb_modrdn: access to attr \"%s\" (new) not allowed\n",
new_rdn[0][a_cnt]->la_attr.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: access to attr \"%s\" "
@ -652,7 +692,9 @@ retry: /* transaction retry */
/* 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" ));
LDAP_LOG ( OPERATION, ERR,
"bdb_modrdn: can't figure out old RDN values(s) "
"from old RDN\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: can't figure out old RDN value(s) "
@ -673,7 +715,8 @@ retry: /* transaction retry */
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 ));
LDAP_LOG ( OPERATION, ERR, "bdb_modrdn: %s: %s (old)\n",
text, old_rdn[0][d_cnt]->la_attr.bv_val, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: %s: %s (old)\n",
@ -686,7 +729,9 @@ retry: /* transaction retry */
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 ));
LDAP_LOG ( OPERATION, ERR,
"bdb_modrdn: access to attr \"%s\" (old) not allowed\n",
old_rdn[0][d_cnt]->la_attr.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: access to attr \"%s\" "
@ -813,7 +858,9 @@ retry: /* transaction retry */
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 ));
LDAP_LOG ( OPERATION, 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",
@ -824,7 +871,8 @@ retry: /* transaction retry */
} else {
#ifdef NEW_LOGGING
LDAP_LOG (( "modrdn", LDAP_LEVEL_RESULTS, "bdb_modrdn: %s : %s (%d)\n", text, db_strerror(rc), rc ));
LDAP_LOG ( OPERATION, 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 );

5
servers/slapd/back-bdb/nextid.c
View file

@ -58,9 +58,8 @@ int bdb_last_id( BackendDB *be, DB_TXN *tid )
default:
#ifdef NEW_LOGGING
LDAP_LOG (( "nextid", LDAP_LEVEL_ERR,
"bdb_last_id: get failed: %s (%d)\n",
db_strerror(rc), rc ));
LDAP_LOG ( INDEX, ERR, "bdb_last_id: get failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"=> bdb_last_id: get failed: %s (%d)\n",

14
servers/slapd/back-bdb/operational.c
View file

@ -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 );
@ -50,8 +50,8 @@ retry: /* transaction retry */
}
#endif
#ifdef NEW_LOGGING
LDAP_LOG (( "operational", LDAP_LEVEL_DETAIL1,
"=> bdb_operational: retrying...\n" ));
LDAP_LOG ( OPERATION, DETAIL1,
"=> bdb_operational: retrying...\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "==> bdb_operational: retrying...\n",
0, 0, 0 );
@ -70,9 +70,9 @@ retry: /* transaction retry */
rc = TXN_BEGIN( bdb->bi_dbenv, NULL, &ltid, bdb->bi_db_opflags );
if ( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "operational", LDAP_LEVEL_ERR,
LDAP_LOG ( OPERATION, ERR,
"=> bdb_operational: txn_begin failed: %s (%d)\n",
db_strerror(rc), rc ));
db_strerror(rc), rc, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_operational: txn_begin failed: %s (%d)\n",
@ -104,9 +104,9 @@ retry: /* transaction retry */
default:
#ifdef NEW_LOGGING
LDAP_LOG (( "operational", LDAP_LEVEL_ERR,
LDAP_LOG ( OPERATION, ERR,
"=> bdb_operational: has_children failed: %s (%d)\n",
db_strerror(rc), rc ));
db_strerror(rc), rc, 0 );
#else
Debug(LDAP_DEBUG_ARGS,
"<=- bdb_operational: has_children failed: %s (%d)\n",

14
servers/slapd/back-bdb/passwd.c
View file

@ -51,8 +51,8 @@ bdb_exop_passwd(
&id, NULL, &new, text );
#ifdef NEW_LOGGING
LDAP_LOG (( "passwd", LDAP_LEVEL_ENTRY, "==>bdb_exop_passwd: \"%s\"\n",
id.bv_val ? id.bv_val : "" ));
LDAP_LOG ( ACL, ENTRY,
"==>bdb_exop_passwd: \"%s\"\n", id.bv_val ? id.bv_val : "", 0, 0 );
#else
Debug( LDAP_DEBUG_ARGS, "==> bdb_exop_passwd: \"%s\"\n",
id.bv_val ? id.bv_val : "", 0, 0 );
@ -89,8 +89,8 @@ bdb_exop_passwd(
}
#ifdef NEW_LOGGING
LDAP_LOG (( "passwd", LDAP_LEVEL_DETAIL1, "bdb_exop_passwd: \"%s\"%s\"\n",
dn.bv_val, id.bv_len ? " (proxy)" : "" ));
LDAP_LOG ( ACL, DETAIL1, "bdb_exop_passwd: \"%s\"%s\"\n",
dn.bv_val, id.bv_len ? " (proxy)" : "", 0 );
#else
Debug( LDAP_DEBUG_TRACE, "bdb_exop_passwd: \"%s\"%s\n",
dn.bv_val, id.bv_len ? " (proxy)" : "", 0 );
@ -115,7 +115,7 @@ retry: /* transaction retry */
bdb_cache_return_entry_w(bdb->bi_dbenv, &bdb->bi_cache, e, &lock);
}
#ifdef NEW_LOGGING
LDAP_LOG (( "passwd", LDAP_LEVEL_DETAIL1, "bdb_exop_passwd: retrying...\n" ));
LDAP_LOG ( ACL, DETAIL1, "bdb_exop_passwd: retrying...\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "bdb_exop_passwd: retrying...\n", 0, 0, 0 );
#endif
@ -136,7 +136,9 @@ retry: /* transaction retry */
*text = NULL;
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "passwd", LDAP_LEVEL_ERR, "bdb_exop_passwd: txn_begin failed: %s (%d)\n", db_strerror(rc), rc ));
LDAP_LOG ( ACL, ERR,
"bdb_exop_passwd: txn_begin failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_exop_passwd: txn_begin failed: %s (%d)\n",

14
servers/slapd/back-bdb/referral.c
View file

@ -66,9 +66,9 @@ dn2entry_retry:
goto dn2entry_retry;
default:
#ifdef NEW_LOGGING
LDAP_LOG (( "referral", LDAP_LEVEL_ERR,
"bdb_referrals: dn2entry failed: %s (%d)\n",
db_strerror(rc), rc ));
LDAP_LOG ( OPERATION, ERR,
"bdb_referrals: dn2entry failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_referrals: dn2entry failed: %s (%d)\n",
@ -94,9 +94,9 @@ dn2entry_retry:
matched_dn = ch_strdup( matched->e_dn );
#ifdef NEW_LOGGING
LDAP_LOG (( "referral", LDAP_LEVEL_DETAIL1,
LDAP_LOG ( OPERATION, DETAIL1,
"bdb_referrals: op=%ld target=\"%s\" matched=\"%s\"\n",
(long) op->o_tag, dn->bv_val, matched_dn ));
(long) op->o_tag, dn->bv_val, matched_dn );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_referrals: op=%ld target=\"%s\" matched=\"%s\"\n",
@ -139,9 +139,9 @@ dn2entry_retry:
refs, &e->e_name, dn, LDAP_SCOPE_DEFAULT );
#ifdef NEW_LOGGING
LDAP_LOG (( "referral", LDAP_LEVEL_DETAIL1,
LDAP_LOG ( OPERATION, DETAIL1,
"bdb_referrals: op=%ld target=\"%s\" matched=\"%s\"\n",
(long) op->o_tag, dn->bv_val, e->e_dn ));
(long) op->o_tag, dn->bv_val, e->e_dn );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_referrals: op=%ld target=\"%s\" matched=\"%s\"\n",

38
servers/slapd/back-bdb/search.c
View file

@ -63,7 +63,7 @@ bdb_search(
DB_LOCK lock;
#ifdef NEW_LOGGING
LDAP_LOG (( "search", LDAP_LEVEL_ENTRY,"bdb_back_search\n"));
LDAP_LOG ( OPERATION, ENTRY, "bdb_back_search\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "=> bdb_back_search\n",
0, 0, 0);
@ -175,7 +175,8 @@ dn2entry_retry:
}
#ifdef NEW_LOGGING
LDAP_LOG (( "search", LDAP_LEVEL_RESULTS,"bdb_search: entry is referral\n"));
LDAP_LOG ( OPERATION, RESULTS,
"bdb_search: entry is referral\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "bdb_search: entry is referral\n",
0, 0, 0 );
@ -288,7 +289,7 @@ dn2entry_retry:
if ( candidates[0] == 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "search", LDAP_LEVEL_RESULTS,"bdb_search: no candidates\n"));
LDAP_LOG ( OPERATION, RESULTS, "bdb_search: no candidates\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "bdb_search: no candidates\n",
0, 0, 0 );
@ -349,7 +350,8 @@ id2entry_retry:
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));
LDAP_LOG ( OPERATION, RESULTS,
"bdb_search: candidate %ld not found\n", (long) id, 0, 0);
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_search: candidate %ld not found\n",
@ -411,7 +413,8 @@ id2entry_retry:
} 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));
LDAP_LOG ( OPERATION, RESULTS,
"bdb_search: \"%s\" in subtree\n", e->edn, 0, 0);
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_search: \"%s\" in subtree\n",
@ -466,9 +469,9 @@ id2entry_retry:
} else {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL2,
LDAP_LOG(OPERATION, DETAIL2,
"bdb_search: candidate referral %ld scope not okay\n",
id ));
id, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_search: candidate referral %ld scope not okay\n",
@ -536,7 +539,8 @@ id2entry_retry:
}
} else {
#ifdef NEW_LOGGING
LDAP_LOG (( "search", LDAP_LEVEL_RESULTS,"bdb_search: %ld scope not okay\n", (long) id));
LDAP_LOG ( OPERATION, RESULTS,
"bdb_search: %ld scope not okay\n", (long) id, 0, 0);
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_search: %ld scope not okay\n",
@ -545,7 +549,8 @@ id2entry_retry:
}
} else {
#ifdef NEW_LOGGING
LDAP_LOG (( "search", LDAP_LEVEL_RESULTS,"bdb_search: %ld does match filter\n", (long) id));
LDAP_LOG ( OPERATION, RESULTS,
"bdb_search: %ld does match filter\n", (long) id, 0, 0);
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_search: %ld does match filter\n",
@ -589,7 +594,8 @@ static int base_candidate(
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));
LDAP_LOG ( OPERATION, ENTRY,
"base_candidate: base: \"%s\" (0x%08lx)\n", e->e_dn, (long) e->e_id, 0);
#else
Debug(LDAP_DEBUG_ARGS, "base_candidates: base: \"%s\" (0x%08lx)\n",
e->e_dn, (long) e->e_id, 0);
@ -669,7 +675,9 @@ static int search_candidates(
*/
#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));
LDAP_LOG ( OPERATION, 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",
@ -741,7 +749,8 @@ static int search_candidates(
if( rc ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "search", LDAP_LEVEL_DETAIL1,"bdb_search_candidates: failed (rc=%d)\n", rc));
LDAP_LOG ( OPERATION, DETAIL1,
"bdb_search_candidates: failed (rc=%d)\n", rc, 0, 0 );
#else
Debug(LDAP_DEBUG_TRACE,
"bdb_search_candidates: failed (rc=%d)\n",
@ -750,7 +759,10 @@ static int search_candidates(
} 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)));
LDAP_LOG ( OPERATION, 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",

61
servers/slapd/back-bdb/tools.c
View file

@ -126,9 +126,8 @@ ID bdb_tool_entry_put(
assert( text->bv_val[0] == '\0' );
#ifdef NEW_LOGGING
LDAP_LOG (( "tools", LDAP_LEVEL_ARGS,
"=> bdb_tool_entry_put( %ld, \"%s\" )\n",
(long) e->e_id, e->e_dn ));
LDAP_LOG ( TOOLS, ARGS, "=> bdb_tool_entry_put( %ld, \"%s\" )\n",
(long) e->e_id, e->e_dn, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "=> bdb_tool_entry_put( %ld, \"%s\" )\n",
(long) e->e_id, e->e_dn, 0 );
@ -141,8 +140,7 @@ ID bdb_tool_entry_put(
"txn_begin failed: %s (%d)",
db_strerror(rc), rc );
#ifdef NEW_LOGGING
LDAP_LOG (( "tools", LDAP_LEVEL_ERR,
"=> bdb_tool_entry_put: %s\n", text->bv_val ));
LDAP_LOG ( TOOLS, ERR, "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"=> bdb_tool_entry_put: %s\n",
@ -157,8 +155,8 @@ ID bdb_tool_entry_put(
"next_id failed: %s (%d)",
db_strerror(rc), rc );
#ifdef NEW_LOGGING
LDAP_LOG (( "tools", LDAP_LEVEL_ERR,
"=> bdb_tool_entry_put: %s\n", text->bv_val ));
LDAP_LOG ( TOOLS, ERR,
"=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
@ -178,8 +176,8 @@ ID bdb_tool_entry_put(
"dn2id_add failed: %s (%d)",
db_strerror(rc), rc );
#ifdef NEW_LOGGING
LDAP_LOG (( "tools", LDAP_LEVEL_ERR,
"=> bdb_tool_entry_put: %s\n", text->bv_val ));
LDAP_LOG ( TOOLS, ERR,
"=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
@ -194,8 +192,8 @@ ID bdb_tool_entry_put(
"id2entry_add failed: %s (%d)",
db_strerror(rc), rc );
#ifdef NEW_LOGGING
LDAP_LOG (( "tools", LDAP_LEVEL_ERR,
"=> bdb_tool_entry_put: %s\n", text->bv_val ));
LDAP_LOG ( TOOLS, ERR,
"=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
@ -209,8 +207,8 @@ ID bdb_tool_entry_put(
"index_entry_add failed: %s (%d)",
db_strerror(rc), rc );
#ifdef NEW_LOGGING
LDAP_LOG (( "tools", LDAP_LEVEL_ERR,
"=> bdb_tool_entry_put: %s\n", text->bv_val ));
LDAP_LOG ( TOOLS, ERR,
"=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
@ -226,8 +224,8 @@ done:
"txn_commit failed: %s (%d)",
db_strerror(rc), rc );
#ifdef NEW_LOGGING
LDAP_LOG (( "tools", LDAP_LEVEL_ERR,
"=> bdb_tool_entry_put: %s\n", text->bv_val ));
LDAP_LOG ( TOOLS, ERR,
"=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"=> bdb_tool_entry_put: %s\n",
@ -242,8 +240,8 @@ done:
"txn_aborted! %s (%d)",
db_strerror(rc), rc );
#ifdef NEW_LOGGING
LDAP_LOG (( "tools", LDAP_LEVEL_ERR,
"=> bdb_tool_entry_put: %s\n", text->bv_val ));
LDAP_LOG ( TOOLS, ERR,
"=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"=> bdb_tool_entry_put: %s\n",
@ -266,8 +264,8 @@ int bdb_tool_entry_reindex(
struct berval pdn;
#ifdef NEW_LOGGING
LDAP_LOG (( "tools", LDAP_LEVEL_ARGS,
"=> bdb_tool_entry_reindex( %ld )\n", (long) id ));
LDAP_LOG ( TOOLS, ARGS,
"=> bdb_tool_entry_reindex( %ld )\n", (long) id, 0, 0 );
#else
Debug( LDAP_DEBUG_ARGS, "=> bdb_tool_entry_reindex( %ld )\n",
(long) id, 0, 0 );
@ -277,9 +275,9 @@ int bdb_tool_entry_reindex(
if( e == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "tools", LDAP_LEVEL_DETAIL1,
LDAP_LOG ( TOOLS, DETAIL1,
"bdb_tool_entry_reindex:: could not locate id=%ld\n",
(long) id ));
(long) id, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"bdb_tool_entry_reindex:: could not locate id=%ld\n",
@ -291,9 +289,9 @@ int bdb_tool_entry_reindex(
rc = TXN_BEGIN( bi->bi_dbenv, NULL, &tid, bi->bi_db_opflags );
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "tools", LDAP_LEVEL_ERR,
LDAP_LOG ( TOOLS, ERR,
"=> bdb_tool_entry_reindex: txn_begin failed: %s (%d)\n",
db_strerror(rc), rc ));
db_strerror(rc), rc, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"=> bdb_tool_entry_reindex: txn_begin failed: %s (%d)\n",
@ -310,9 +308,8 @@ int bdb_tool_entry_reindex(
*/
#ifdef NEW_LOGGING
LDAP_LOG (( "tools", LDAP_LEVEL_ERR,
"=> bdb_tool_entry_reindex( %ld, \"%s\" )\n",
(long) id, e->e_dn ));
LDAP_LOG ( TOOLS, ERR,
"=> bdb_tool_entry_reindex( %ld, \"%s\" )\n", (long) id, e->e_dn, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "=> bdb_tool_entry_reindex( %ld, \"%s\" )\n",
(long) id, e->e_dn, 0 );
@ -327,9 +324,9 @@ int bdb_tool_entry_reindex(
rc = bdb_dn2id_add( be, tid, &pdn, e );
if( rc != 0 && rc != DB_KEYEXIST ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "tools", LDAP_LEVEL_ERR,
LDAP_LOG ( TOOLS, ERR,
"=> bdb_tool_entry_reindex: dn2id_add failed: %s (%d)\n",
db_strerror(rc), rc ));
db_strerror(rc), rc, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"=> bdb_tool_entry_reindex: dn2id_add failed: %s (%d)\n",
@ -345,9 +342,9 @@ done:
rc = TXN_COMMIT( tid, 0 );
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "tools", LDAP_LEVEL_ERR,
LDAP_LOG ( TOOLS, ERR,
"=> bdb_tool_entry_reindex: txn_commit failed: %s (%d)\n",
db_strerror(rc), rc ));
db_strerror(rc), rc, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"=> bdb_tool_entry_reindex: txn_commit failed: %s (%d)\n",
@ -359,9 +356,9 @@ done:
} else {
TXN_ABORT( tid );
#ifdef NEW_LOGGING
LDAP_LOG (( "tools", LDAP_LEVEL_DETAIL1,
LDAP_LOG ( TOOLS, DETAIL1,
"=> bdb_tool_entry_reindex: txn_aborted! %s (%d)\n",
db_strerror(rc), rc ));
db_strerror(rc), rc, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"=> bdb_tool_entry_reindex: txn_aborted! %s (%d)\n",

15
servers/slapd/back-ldap/add.c
View file

@ -62,8 +62,7 @@ ldap_back_add(
struct berval mdn = { 0, NULL };
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY, "ldap_back_add: %s\n",
e->e_dn ));
LDAP_LOG( BACK_LDAP, ENTRY, "ldap_back_add: %s\n", e->e_dn, 0, 0 );
#else /* !NEW_LOGGING */
Debug(LDAP_DEBUG_ARGS, "==> ldap_back_add: %s\n", e->e_dn, 0, 0);
#endif /* !NEW_LOGGING */
@ -86,9 +85,8 @@ ldap_back_add(
mdn = e->e_name;
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"[rw] addDn: \"%s\" -> \"%s\"\n",
e->e_dn, mdn.bv_val ));
LDAP_LOG( BACK_LDAP, DETAIL1,
"[rw] addDn: \"%s\" -> \"%s\"\n", e->e_dn, mdn.bv_val, 0 );
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_ARGS, "rw> addDn: \"%s\" -> \"%s\"\n%s",
e->e_dn, mdn.bv_val, "" );
@ -202,10 +200,9 @@ ldap_dnattr_rewrite(
continue;
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"[rw] bindDn (in add of dn-valued"
" attr): \"%s\" -> \"%s\"\n",
a_vals->bv_val, mattr ));
LDAP_LOG( BACK_LDAP, DETAIL1,
"[rw] bindDn (in add of dn-valued"
" attr): \"%s\" -> \"%s\"\n", a_vals->bv_val, mattr, 0 );
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_ARGS,
"rw> bindDn (in add of dn-valued attr):"

23
servers/slapd/back-ldap/bind.c
View file

@ -84,8 +84,8 @@ ldap_back_bind(
mdn.bv_val = ( char * )dn->bv_val;
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"[rw] bindDn: \"%s\" -> \"%s\"\n", dn->bv_val, mdn.bv_val ));
LDAP_LOG( BACK_LDAP, DETAIL1,
"[rw] bindDn: \"%s\" -> \"%s\"\n", dn->bv_val, mdn.bv_val, 0 );
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_ARGS, "rw> bindDn: \"%s\" -> \"%s\"\n%s",
dn->bv_val, mdn.bv_val, "" );
@ -258,11 +258,11 @@ ldap_back_getconn(struct ldapinfo *li, Connection *conn, Operation *op)
ber_dupbv( &lc->bound_dn, &lc->conn->c_dn );
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"[rw] bindDn: \"%s\" ->"
LDAP_LOG( BACK_LDAP, DETAIL1,
"[rw] bindDn: \"%s\" ->"
" \"%s\"\n%s",
lc->conn->c_dn.bv_val,
lc->bound_dn.bv_val ));
lc->conn->c_dn.bv_val,
lc->bound_dn.bv_val, "" );
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_ARGS,
"rw> bindDn: \"%s\" ->"
@ -312,9 +312,8 @@ ldap_back_getconn(struct ldapinfo *li, Connection *conn, Operation *op)
ldap_pvt_thread_mutex_unlock( &li->conn_mutex );
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldap_back_getconn: conn %ld inserted\n",
lc->conn->c_connid ));
LDAP_LOG( BACK_LDAP, INFO,
"ldap_back_getconn: conn %ld inserted\n", lc->conn->c_connid, 0, 0);
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_TRACE,
"=>ldap_back_getconn: conn %ld inserted\n%s%s",
@ -330,9 +329,9 @@ ldap_back_getconn(struct ldapinfo *li, Connection *conn, Operation *op)
}
} else {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldap_back_getconn: conn %ld inserted\n",
lc->conn->c_connid ));
LDAP_LOG( BACK_LDAP, INFO,
"ldap_back_getconn: conn %ld inserted\n",
lc->conn->c_connid, 0, 0 );
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_TRACE,
"=>ldap_back_getconn: conn %ld fetched%s%s\n",

5
servers/slapd/back-ldap/compare.c
View file

@ -75,9 +75,8 @@ ldap_back_compare(
mdn.bv_val = ( char * )dn->bv_val;
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"[rw] compareDn: \"%s\" -> \"%s\"\n",
dn->bv_val, mdn.bv_val ));
LDAP_LOG( BACK_LDAP, DETAIL1,
"[rw] compareDn: \"%s\" -> \"%s\"\n", dn->bv_val, mdn.bv_val, 0 );
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_ARGS, "rw> compareDn: \"%s\" -> \"%s\"\n%s",
dn->bv_val, mdn.bv_val, "" );

4
servers/slapd/back-ldap/delete.c
View file

@ -75,8 +75,8 @@ ldap_back_delete(
mdn.bv_val = ( char * )dn->bv_val;
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"[rw] deleteDn: \"%s\" -> \"%s\"\n", dn->bv_val, mdn.bv_val ));
LDAP_LOG( BACK_LDAP, DETAIL1,
"[rw] deleteDn: \"%s\" -> \"%s\"\n", dn->bv_val, mdn.bv_val, 0 );
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_ARGS, "rw> deleteDn: \"%s\" -> \"%s\"\n%s",
dn->bv_val, mdn.bv_val, "" );

12
servers/slapd/back-ldap/group.c
View file

@ -100,9 +100,9 @@ ldap_back_group(
mop_ndn = *op_ndn;
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"[rw] bindDn (op ndn in group):"
" \"%s\" -> \"%s\"\n", op_ndn->bv_val, mop_ndn.bv_val ));
LDAP_LOG( BACK_LDAP, DETAIL1,
"[rw] bindDn (op ndn in group): \"%s\" -> \"%s\"\n",
op_ndn->bv_val, mop_ndn.bv_val, 0 );
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_ARGS,
"rw> bindDn (op ndn in group): \"%s\" -> \"%s\"\n%s",
@ -126,9 +126,9 @@ ldap_back_group(
mgr_ndn = *gr_ndn;
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"[rw] searchBase (gr ndn in group):"
" \"%s\" -> \"%s\"\n%s", gr_ndn->bv_val, mgr_ndn.bv_val ));
LDAP_LOG( BACK_LDAP, DETAIL1,
"[rw] searchBase (gr ndn in group): \"%s\" -> \"%s\"\n%s",
gr_ndn->bv_val, mgr_ndn.bv_val, "" );
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_ARGS,
"rw> searchBase (gr ndn in group):"

4
servers/slapd/back-ldap/modify.c
View file

@ -79,8 +79,8 @@ ldap_back_modify(
mdn.bv_val = ( char * )dn->bv_val;
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"[rw] modifyDn: \"%s\" -> \"%s\"\n", dn->bv_val, mdn.bv_val ));
LDAP_LOG( BACK_LDAP, DETAIL1,
"[rw] modifyDn: \"%s\" -> \"%s\"\n", dn->bv_val, mdn.bv_val, 0 );
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_ARGS, "rw> modifyDn: \"%s\" -> \"%s\"\n%s",
dn->bv_val, mdn.bv_val, "" );

11
servers/slapd/back-ldap/modrdn.c
View file

@ -84,10 +84,9 @@ ldap_back_modrdn(
mnewSuperior.bv_val = ( char * )newSuperior;
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"[rw] newSuperiorDn:"
" \"%s\" -> \"%s\"\n",
newSuperior, mnewSuperior.bv_val ));
LDAP_LOG( BACK_LDAP, DETAIL1,
"[rw] newSuperiorDn:" " \"%s\" -> \"%s\"\n",
newSuperior, mnewSuperior.bv_val, 0 );
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_ARGS, "rw> newSuperiorDn:"
" \"%s\" -> \"%s\"\n%s",
@ -125,8 +124,8 @@ ldap_back_modrdn(
mdn.bv_val = ( char * )dn->bv_val;
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"[rw] modrDn: \"%s\" -> \"%s\"\n", dn->bv_val, mdn.bv_val ));
LDAP_LOG( BACK_LDAP, DETAIL1,
"[rw] modrDn: \"%s\" -> \"%s\"\n", dn->bv_val, mdn.bv_val, 0 );
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_ARGS, "rw> modrDn: \"%s\" -> \"%s\"\n%s",
dn->bv_val, mdn.bv_val, "" );

41
servers/slapd/back-ldap/search.c
View file

@ -153,9 +153,9 @@ ldap_back_search(
mbase = *base;
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"[rw] searchBase: \"%s\" -> \"%s\"\n%",
base->bv_val, mbase.bv_val ));
LDAP_LOG( BACK_LDAP, DETAIL1,
"[rw] searchBase: \"%s\" -> \"%s\"\n",
base->bv_val, mbase.bv_val, 0 );
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_ARGS, "rw> searchBase: \"%s\" -> \"%s\"\n%s",
base->bv_val, mbase.bv_val, "" );
@ -191,9 +191,9 @@ ldap_back_search(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"[rw] searchFilter: \"%s\" -> \"%s\"\n",
filterstr->bv_val, mfilter.bv_val ));
LDAP_LOG( BACK_LDAP, DETAIL1,
"[rw] searchFilter: \"%s\" -> \"%s\"\n",
filterstr->bv_val, mfilter.bv_val, 0 );
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_ARGS,
"rw> searchFilter: \"%s\" -> \"%s\"\n%s",
@ -300,10 +300,8 @@ fail:;
mmatch = ( char * )match;
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"[rw] matchedDn:"
" \"%s\" -> \"%s\"\n",
match, mmatch ));
LDAP_LOG( BACK_LDAP, DETAIL1,
"[rw] matchedDn:" " \"%s\" -> \"%s\"\n", match, mmatch, 0 );
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_ARGS, "rw> matchedDn:"
" \"%s\" -> \"%s\"\n%s",
@ -389,9 +387,9 @@ ldap_send_entry(
ent.e_name = bdn;
} else {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"[rw] searchResult: \"%s\""
" -> \"%s\"\n", bdn.bv_val, ent.e_dn ));
LDAP_LOG( BACK_LDAP, DETAIL1,
"[rw] searchResult: \"%s\"" " -> \"%s\"\n",
bdn.bv_val, ent.e_dn, 0 );
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_ARGS, "rw> searchResult: \"%s\""
" -> \"%s\"\n%s", bdn.bv_val, ent.e_dn, "" );
@ -428,9 +426,8 @@ ldap_send_entry(
if (slap_bv2undef_ad(&mapped, &attr->a_desc, &text)
!= LDAP_SUCCESS) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"slap_bv2undef_ad(%s): "
"%s\n", mapped.bv_val, text ));
LDAP_LOG( BACK_LDAP, DETAIL1,
"slap_bv2undef_ad(%s): %s\n", mapped.bv_val, text, 0 );
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_ANY,
"slap_bv2undef_ad(%s): "
@ -506,14 +503,10 @@ ldap_send_entry(
}
newval.bv_len = strlen( newval.bv_val );
#ifdef NEW_LOGGING
LDAP_LOG(( "backend",
LDAP_LEVEL_DETAIL1,
"[rw] searchResult on"
" attr=%s:"
" \"%s\" -> \"%s\"\n",
attr->a_desc->ad_type->sat_cname.bv_val,
bv->bv_val,
newval.bv_val ));
LDAP_LOG( BACK_LDAP, DETAIL1,
"[rw] searchResult on attr=%s: \"%s\" -> \"%s\"\n",
attr->a_desc->ad_type->sat_cname.bv_val,
bv->bv_val, newval.bv_val );
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_ARGS,
"rw> searchResult on attr=%s: \"%s\" -> \"%s\"\n",

4
servers/slapd/back-ldap/suffixmassage.c
View file

@ -99,9 +99,9 @@ ldap_back_dn_massage(
strncpy( res->bv_val, dn->bv_val, diff );
strcpy( &res->bv_val[diff], li->suffix_massage[i+dst].bv_val );
#ifdef NEW_LOGGING
LDAP_LOG (( "suffixmassage", LDAP_LEVEL_ARGS,
LDAP_LOG ( BACK_LDAP, ARGS,
"ldap_back_dn_massage: converted \"%s\" to \"%s\"\n",
dn->bv_val, res->bv_val ));
dn->bv_val, res->bv_val, 0 );
#else
Debug( LDAP_DEBUG_ARGS,
"ldap_back_dn_massage:"

11
servers/slapd/back-ldap/unbind.c
View file

@ -55,9 +55,8 @@ ldap_back_conn_destroy(
struct ldapconn *lc, lc_curr;
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldap_back_conn_destroy: fetching conn %ld\n",
conn->c_connid ));
LDAP_LOG( BACK_LDAP, INFO,
"ldap_back_conn_destroy: fetching conn %ld\n", conn->c_connid, 0, 0 );
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_TRACE,
"=>ldap_back_conn_destroy: fetching conn %ld\n",
@ -72,9 +71,9 @@ ldap_back_conn_destroy(
if (lc) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"ldap_back_conn_destroy: destroying conn %ld\n",
conn->c_connid ));
LDAP_LOG( BACK_LDAP, DETAIL1,
"ldap_back_conn_destroy: destroying conn %ld\n",
conn->c_connid, 0, 0 );
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_TRACE,
"=>ldap_back_conn_destroy: destroying conn %ld\n",

56
servers/slapd/back-ldbm/add.c
View file

@ -35,8 +35,7 @@ ldbm_back_add(
size_t textlen = sizeof textbuf;
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,"ldbm_back_add: %s\n",
e->e_dn ));
LDAP_LOG( BACK_LDBM, ENTRY, "ldbm_back_add: %s\n", e->e_dn, 0, 0 );
#else
Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_add: %s\n", e->e_dn, 0, 0);
#endif
@ -59,9 +58,8 @@ ldbm_back_add(
ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
"ldbm_back_add: entry (%s) failed schema check.\n",
e->e_dn ));
LDAP_LOG( BACK_LDBM, ERR,
"ldbm_back_add: entry (%s) failed schema check.\n", e->e_dn, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "entry failed schema check: %s\n",
text, 0, 0 );
@ -107,9 +105,9 @@ ldbm_back_add(
ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
"ldbm_back_add: Parent of (%s) does not exist.\n",
e->e_dn ));
LDAP_LOG( BACK_LDBM, ERR,
"ldbm_back_add: Parent of (%s) does not exist.\n",
e->e_dn, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "parent does not exist\n",
0, 0, 0 );
@ -133,9 +131,9 @@ ldbm_back_add(
ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
"ldbm_back_add: No write access to parent (%s).\n",
e->e_dn ));
LDAP_LOG( BACK_LDBM, ERR,
"ldbm_back_add: No write access to parent (%s).\n",
e->e_dn, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "no write access to parent\n", 0,
0, 0 );
@ -155,8 +153,8 @@ ldbm_back_add(
ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
"ldbm_back_add: Parent is an alias.\n"));
LDAP_LOG(BACK_LDBM, ERR,
"ldbm_back_add: Parent is an alias.\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "parent is alias\n", 0,
0, 0 );
@ -181,8 +179,8 @@ ldbm_back_add(
ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
"ldbm_back_add: Parent is referral.\n" ));
LDAP_LOG( BACK_LDBM, ERR,
"ldbm_back_add: Parent is referral.\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "parent is referral\n", 0,
0, 0 );
@ -214,9 +212,9 @@ ldbm_back_add(
ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
LDAP_LOG( BACK_LDBM, ERR,
"ldbm_back_add: No write "
"access to parent (\"\").\n" ));
"access to parent (\"\").\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"no write access to parent\n",
@ -236,10 +234,10 @@ ldbm_back_add(
ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
LDAP_LOG( BACK_LDBM, ERR,
"ldbm_back_add: %s add denied.\n",
pdn.bv_val == NULL ? "suffix"
: "entry at root" ));
: "entry at root", 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "%s add denied\n",
pdn.bv_val == NULL ? "suffix"
@ -264,8 +262,8 @@ ldbm_back_add(
ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
"ldbm_back_add: next_id failed.\n" ));
LDAP_LOG( BACK_LDBM, ERR,
"ldbm_back_add: next_id failed.\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "ldbm_add: next_id failed\n",
0, 0, 0 );
@ -291,8 +289,8 @@ ldbm_back_add(
ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
"ldbm_back_add: cache_add_entry_lock failed.\n" ));
LDAP_LOG( BACK_LDBM, ERR,
"ldbm_back_add: cache_add_entry_lock failed.\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "cache_add_entry_lock failed\n", 0, 0,
0 );
@ -310,8 +308,8 @@ ldbm_back_add(
/* attribute indexes */
if ( index_entry_add( be, e, e->e_attrs ) != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
"ldbm_back_add: index_entry_add failed.\n" ));
LDAP_LOG( BACK_LDBM, ERR,
"ldbm_back_add: index_entry_add failed.\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "index_entry_add failed\n", 0,
0, 0 );
@ -326,8 +324,8 @@ ldbm_back_add(
/* dn2id index */
if ( dn2id_add( be, &e->e_nname, e->e_id ) != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
"ldbm_back_add: dn2id_add failed.\n" ));
LDAP_LOG( BACK_LDBM, ERR,
"ldbm_back_add: dn2id_add failed.\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "dn2id_add failed\n", 0,
0, 0 );
@ -343,8 +341,8 @@ ldbm_back_add(
/* id2entry index */
if ( id2entry_add( be, e ) != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
"ldbm_back_add: id2entry_add failed.\n" ));
LDAP_LOG( BACK_LDBM, ERR,
"ldbm_back_add: id2entry_add failed.\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "id2entry_add failed\n", 0,
0, 0 );

7
servers/slapd/back-ldbm/attr.c
View file

@ -15,7 +15,6 @@
#include "slap.h"
#include "back-ldbm.h"
/* for the cache of attribute information (which are indexed, etc.) */
typedef struct ldbm_attrinfo {
AttributeDescription *ai_desc; /* attribute description cn;lang-en */
@ -182,9 +181,9 @@ attr_index_config(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"attr_index_config: index %s 0x%04lx\n",
ad->ad_cname.bv_val, mask ));
LDAP_LOG( BACK_LDBM, DETAIL1,
"attr_index_config: index %s 0x%04lx\n",
ad->ad_cname.bv_val, mask, 0 );
#else
Debug( LDAP_DEBUG_CONFIG, "index %s 0x%04lx\n",
ad->ad_cname.bv_val, mask, 0 );

46
servers/slapd/back-ldbm/attribute.c
View file

@ -16,7 +16,6 @@
#include "back-ldbm.h"
#include "proto-back-ldbm.h"
/* return LDAP_SUCCESS IFF we can retrieve the attributes
* of entry with e_ndn
*/
@ -41,13 +40,12 @@ ldbm_back_attribute(
int nvals = 0;
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ARGS,
"ldbm_back_attribute: gr dn: \"%s\"\n", entry_ndn->bv_val ));
LDAP_LOG(( "backend", LDAP_LEVEL_ARGS,
"ldbm_back_attribute: at: \"%s\"\n", entry_at_name));
LDAP_LOG(( "backend", LDAP_LEVEL_ARGS,
"ldbm_back_attribute: tr dn: \"%s\"\n",
target ? target->e_ndn : "" ));
LDAP_LOG( BACK_LDBM, ARGS,
"ldbm_back_attribute: gr dn: \"%s\"\n", entry_ndn->bv_val, 0, 0 );
LDAP_LOG( BACK_LDBM, ARGS,
"ldbm_back_attribute: at: \"%s\"\n", entry_at_name, 0, 0);
LDAP_LOG( BACK_LDBM, ARGS, "ldbm_back_attribute: tr dn: \"%s\"\n",
target ? target->e_ndn : "", 0, 0 );
#else
Debug( LDAP_DEBUG_ARGS,
"=> ldbm_back_attribute: gr dn: \"%s\"\n",
@ -65,9 +63,9 @@ ldbm_back_attribute(
/* we already have a LOCKED copy of the entry */
e = target;
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"ldbm_back_attribute: target is LOCKED (%s)\n",
entry_ndn->bv_val ));
LDAP_LOG( BACK_LDBM, DETAIL1,
"ldbm_back_attribute: target is LOCKED (%s)\n",
entry_ndn->bv_val, 0, 0);
#else
Debug( LDAP_DEBUG_ARGS,
"=> ldbm_back_attribute: target is entry: \"%s\"\n",
@ -79,9 +77,9 @@ ldbm_back_attribute(
/* can we find entry with reader lock */
if ((e = dn2entry_r(be, entry_ndn, NULL )) == NULL) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
LDAP_LOG( BACK_LDBM, INFO,
"ldbm_back_attribute: cannot find entry (%s)\n",
entry_ndn->bv_val ));
entry_ndn->bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ACL,
"=> ldbm_back_attribute: cannot find entry: \"%s\"\n",
@ -92,9 +90,8 @@ ldbm_back_attribute(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"ldbm_back_attribute: found entry (%s)\n",
entry_ndn->bv_val ));
LDAP_LOG( BACK_LDBM, DETAIL1,
"ldbm_back_attribute: found entry (%s)\n", entry_ndn->bv_val, 0, 0);
#else
Debug( LDAP_DEBUG_ACL,
"=> ldbm_back_attribute: found entry: \"%s\"\n",
@ -107,8 +104,8 @@ ldbm_back_attribute(
if( is_entry_alias( e ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_attribute: entry (%s) is an alias\n", e->e_dn ));
LDAP_LOG( BACK_LDBM, INFO,
"ldbm_back_attribute: entry (%s) is an alias\n", e->e_dn, 0, 0 );
#else
Debug( LDAP_DEBUG_ACL,
"<= ldbm_back_attribute: entry is an alias\n", 0, 0, 0 );
@ -120,8 +117,8 @@ ldbm_back_attribute(
if( is_entry_referral( e ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_attribute: entry (%s) is a referral.\n", e->e_dn ));
LDAP_LOG( BACK_LDBM, INFO,
"ldbm_back_attribute: entry (%s) is a referral.\n", e->e_dn, 0, 0 );
#else
Debug( LDAP_DEBUG_ACL,
"<= ldbm_back_attribute: entry is an referral\n", 0, 0, 0 );
@ -141,8 +138,8 @@ ldbm_back_attribute(
if ((attr = attr_find(e->e_attrs, entry_at)) == NULL) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_attribute: failed to find %s.\n", entry_at_name ));
LDAP_LOG( BACK_LDBM, INFO,
"ldbm_back_attribute: failed to find %s.\n", entry_at_name, 0, 0 );
#else
Debug( LDAP_DEBUG_ACL,
"<= ldbm_back_attribute: failed to find %s\n",
@ -199,9 +196,8 @@ return_results:
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
"ldbm_back_attribute: rc=%d nvals=%d.\n",
rc, nvals ));
LDAP_LOG( BACK_LDBM, ENTRY,
"ldbm_back_attribute: rc=%d nvals=%d.\n", rc, nvals, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"ldbm_back_attribute: rc=%d nvals=%d\n",

12
servers/slapd/back-ldbm/bind.c
View file

@ -44,8 +44,8 @@ ldbm_back_bind(
AttributeDescription *password = slap_schema.si_ad_userPassword;
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
"ldbm_back_bind: dn: %s.\n", dn->bv_val ));
LDAP_LOG( BACK_LDBM, ENTRY,
"ldbm_back_bind: dn: %s.\n", dn->bv_val, 0, 0 );
#else
Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_bind: dn: %s\n", dn->bv_val, 0, 0);
#endif
@ -113,8 +113,8 @@ ldbm_back_bind(
if ( is_entry_alias( e ) ) {
/* entry is an alias, don't allow bind */
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_bind: entry (%s) is an alias.\n", e->e_dn ));
LDAP_LOG( BACK_LDBM, INFO,
"ldbm_back_bind: entry (%s) is an alias.\n", e->e_dn, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "entry is alias\n", 0,
0, 0 );
@ -134,8 +134,8 @@ ldbm_back_bind(
conn, op, e );
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_bind: entry(%s) is a referral.\n", e->e_dn ));
LDAP_LOG( BACK_LDBM, INFO,
"ldbm_back_bind: entry(%s) is a referral.\n", e->e_dn, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0,
0, 0 );

84
servers/slapd/back-ldbm/cache.c
View file

@ -116,9 +116,9 @@ cache_return_entry_rw( Cache *cache, Entry *e, int rw )
ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
LDAP_LOG( CACHE, DETAIL1,
"cache_return_entry_rw: return (%ld):%s, refcnt=%d\n",
id, rw ? "w" : "r", refcnt ));
id, rw ? "w" : "r", refcnt );
#else
Debug( LDAP_DEBUG_TRACE,
"====> cache_return_entry_%s( %ld ): created (%d)\n",
@ -131,9 +131,9 @@ cache_return_entry_rw( Cache *cache, Entry *e, int rw )
ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
LDAP_LOG( CACHE, DETAIL1,
"cache_return_entry_rw: %ld, delete pending (%d).\n",
id, refcnt ));
id, refcnt, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"====> cache_return_entry_%s( %ld ): delete pending (%d)\n",
@ -150,9 +150,8 @@ cache_return_entry_rw( Cache *cache, Entry *e, int rw )
ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
"cache_return_entry_rw: (%ld): deleted (%d)\n",
id, refcnt ));
LDAP_LOG( CACHE, DETAIL1,
"cache_return_entry_rw: (%ld): deleted (%d)\n", id, refcnt, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"====> cache_return_entry_%s( %ld ): deleted (%d)\n",
@ -165,9 +164,9 @@ cache_return_entry_rw( Cache *cache, Entry *e, int rw )
ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
LDAP_LOG( CACHE, DETAIL1,
"cache_return_entry_rw: ID %ld:%s returned (%d)\n",
id, rw ? "w": "r", refcnt ));
id, rw ? "w": "r", refcnt );
#else
Debug( LDAP_DEBUG_TRACE,
"====> cache_return_entry_%s( %ld ): returned (%d)\n",
@ -218,9 +217,9 @@ cache_add_entry_rw(
Entry *ee;
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_ENTRY,
LDAP_LOG( CACHE, ENTRY,
"cache_add_entry_rw: add (%s):%s to cache\n",
e->e_dn, rw ? "w" : "r" ));
e->e_dn, rw ? "w" : "r", 0 );
#endif
/* set cache mutex */
ldap_pvt_thread_mutex_lock( &cache->c_mutex );
@ -232,9 +231,9 @@ cache_add_entry_rw(
ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_ERR,
LDAP_LOG( CACHE, ERR,
"cache_add_entry_rw: add (%s):%ld private init failed!\n",
e->e_dn, e->e_id ));
e->e_dn, e->e_id, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"====> cache_add_entry( %ld ): \"%s\": private init failed!\n",
@ -251,9 +250,9 @@ cache_add_entry_rw(
ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
"cache_add_entry: (%s):%ld already in cache.\n",
e->e_dn, e->e_id ));
LDAP_LOG( CACHE, DETAIL1,
"cache_add_entry: (%s):%ld already in cache.\n",
e->e_dn, e->e_id, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"====> cache_add_entry( %ld ): \"%s\": already in dn cache\n",
@ -270,9 +269,9 @@ cache_add_entry_rw(
(AVL_CMP) entry_id_cmp, avl_dup_error ) != 0 )
{
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
"cache_add_entry: (%s):%ls already in cache.\n",
e->e_dn, e->e_id ));
LDAP_LOG( CACHE, DETAIL1,
"cache_add_entry: (%s):%ls already in cache.\n",
e->e_dn, e->e_id, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"====> cache_add_entry( %ld ): \"%s\": already in id cache\n",
@ -284,9 +283,9 @@ cache_add_entry_rw(
(AVL_CMP) entry_dn_cmp ) == NULL )
{
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_INFO,
"cache_add_entry: can't delete (%s) from cache.\n",
e->e_dn ));
LDAP_LOG( CACHE, INFO,
"cache_add_entry: can't delete (%s) from cache.\n",
e->e_dn, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "====> can't delete from dn cache\n",
0, 0, 0 );
@ -372,9 +371,9 @@ cache_update_entry(
(AVL_CMP) entry_dn_cmp, avl_dup_error ) != 0 )
{
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
LDAP_LOG( CACHE, DETAIL1,
"cache_update_entry: (%s):%ld already in dn cache\n",
e->e_dn, e->e_id ));
e->e_dn, e->e_id, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"====> cache_update_entry( %ld ): \"%s\": already in dn cache\n",
@ -391,9 +390,9 @@ cache_update_entry(
(AVL_CMP) entry_id_cmp, avl_dup_error ) != 0 )
{
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
LDAP_LOG( CACHE, DETAIL1,
"cache_update_entry: (%s)%ld already in id cache\n",
e->e_dn, e->e_id ));
e->e_dn, e->e_id, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"====> cache_update_entry( %ld ): \"%s\": already in id cache\n",
@ -405,9 +404,9 @@ cache_update_entry(
(AVL_CMP) entry_dn_cmp ) == NULL )
{
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_INFO,
"cache_update_entry: can't delete (%s)%ld from dn cache.\n",
e->e_dn, e->e_id ));
LDAP_LOG( CACHE, INFO,
"cache_update_entry: can't delete (%s)%ld from dn cache.\n",
e->e_dn, e->e_id, 0 );
#else
Debug( LDAP_DEBUG_ANY, "====> can't delete from dn cache\n",
0, 0, 0 );
@ -511,9 +510,9 @@ try_again:
ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_INFO,
LDAP_LOG( CACHE, INFO,
"cache_find_entry_dn2id: (%s) %ld not ready: %d\n",
ndn->bv_val, id, state ));
ndn->bv_val, id, state );
#else
Debug(LDAP_DEBUG_TRACE,
"====> cache_find_entry_dn2id(\"%s\"): %ld (not ready) %d\n",
@ -532,9 +531,9 @@ try_again:
ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
LDAP_LOG( CACHE, DETAIL1,
"cache_find_entry_dn2id: (%s): %ld %d tries\n",
ndn->bv_val, id, count ));
ndn->bv_val, id, count );
#else
Debug(LDAP_DEBUG_TRACE,
"====> cache_find_entry_dn2id(\"%s\"): %ld (%d tries)\n",
@ -594,9 +593,9 @@ try_again:
ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_INFO,
LDAP_LOG( CACHE, INFO,
"cache_find_entry_id: (%ld)->%ld not ready (%d).\n",
id, ep_id, state ));
id, ep_id, state );
#else
Debug(LDAP_DEBUG_TRACE,
@ -618,9 +617,9 @@ try_again:
ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
LDAP_LOG( CACHE, DETAIL1,
"cache_find_entry_id: %ld -> %s found %d tries.\n",
ep_id, ep->e_dn, count ));
ep_id, ep->e_dn, count );
#else
Debug(LDAP_DEBUG_TRACE,
"====> cache_find_entry_id( %ld ) \"%s\" (found) (%d tries)\n",
@ -661,8 +660,8 @@ cache_delete_entry(
assert( e->e_private );
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_ENTRY,
"cache_delete_entry: delete %ld.\n", e->e_id ));
LDAP_LOG( CACHE, ENTRY,
"cache_delete_entry: delete %ld.\n", e->e_id, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "====> cache_delete_entry( %ld )\n",
e->e_id, 0, 0 );
@ -723,8 +722,7 @@ cache_release_all( Cache *cache )
ldap_pvt_thread_mutex_lock( &cache->c_mutex );
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_ENTRY,
"cache_release_all: enter\n" ));
LDAP_LOG( CACHE, ENTRY, "cache_release_all: enter\n" , 0, 0, 0);
#else
Debug( LDAP_DEBUG_TRACE, "====> cache_release_all\n", 0, 0, 0 );
#endif
@ -740,8 +738,8 @@ cache_release_all( Cache *cache )
if ( cache->c_cursize ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_INFO,
"cache_release_all: Entry cache could not be emptied.\n" ));
LDAP_LOG( CACHE, INFO,
"cache_release_all: Entry cache could not be emptied.\n", 0, 0, 0);
#else
Debug( LDAP_DEBUG_TRACE, "Entry-cache could not be emptied\n", 0, 0, 0 );
#endif

8
servers/slapd/back-ldbm/close.c
View file

@ -24,16 +24,16 @@ ldbm_back_db_close( Backend *be )
ldap_pvt_thread_join( li->li_dbsynctid, (void *) NULL );
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_CRIT,
"ldbm_back_db_close: ldbm backend syncing\n" ));
LDAP_LOG( BACK_LDBM, CRIT,
"ldbm_back_db_close: ldbm backend syncing\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldbm backend syncing\n", 0, 0, 0 );
#endif
ldbm_cache_flush_all( be );
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_CRIT,
"ldbm_back_db_close: ldbm backend synch'ed\n" ));
LDAP_LOG( BACK_LDBM, CRIT,
"ldbm_back_db_close: ldbm backend synch'ed\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldbm backend done syncing\n", 0, 0, 0 );
#endif

4
servers/slapd/back-ldbm/compare.c
View file

@ -69,8 +69,8 @@ ldbm_back_compare(
conn, op, e );
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_compare: entry (%s) is a referral.\n", e->e_dn ));
LDAP_LOG( BACK_LDBM, INFO,
"ldbm_back_compare: entry (%s) is a referral.\n", e->e_dn, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0,
0, 0 );

21
servers/slapd/back-ldbm/config.c
View file

@ -107,9 +107,9 @@ ldbm_back_db_config(
int i;
if ( argc < 2 ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "config", LDAP_LEVEL_ERR, "ldbm_back_db_config: %s: "
LDAP_LOG ( CONFIG, ERR, "ldbm_back_db_config: %s: "
"line %d: missing frequency value in \"dbsync <frequency> "
"[<wait-times> [wait-interval]]\" line\n", fname, lineno ));
"[<wait-times> [wait-interval]]\" line\n", fname, lineno, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"%s: line %d: missing frquency value in \"dbsync <frequency> [<wait-times> [wait-interval]]\" line\n",
@ -122,10 +122,11 @@ ldbm_back_db_config(
if( i < 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "config", LDAP_LEVEL_ERR, "ldbm_back_db_config: %s: "
LDAP_LOG ( CONFIG, ERR,
"ldbm_back_db_config: %s: "
"line %d: frequency value (%d) invalid \"dbsync "
"<frequency> [<wait-times> [wait-interval]]\" line\n",
fname, lineno, i ));
fname, lineno, i );
#else
Debug( LDAP_DEBUG_ANY,
"%s: line %d: frquency value (%d) invalid \"dbsync <frequency> [<wait-times> [wait-interval]]\" line\n",
@ -140,10 +141,10 @@ ldbm_back_db_config(
i = atoi( argv[2] );
if ( i < 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "config",LDAP_LEVEL_ERR, "ldbm_back_db_config: %s: "
LDAP_LOG ( CONFIG,ERR, "ldbm_back_db_config: %s: "
"line %d: frequency value (%d) invalid \"dbsync "
"<frequency> [<wait-times> [wait-interval]]\" line\n",
fname, lineno, i ));
fname, lineno, i );
#else
Debug( LDAP_DEBUG_ANY,
"%s: line %d: frquency value (%d) invalid \"dbsync <frequency> [<wait-times> [wait-interval]]\" line\n",
@ -158,10 +159,10 @@ ldbm_back_db_config(
i = atoi( argv[3] );
if ( i <= 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "config",LDAP_LEVEL_ERR, "ldbm_back_db_config: %s: "
LDAP_LOG ( CONFIG,ERR, "ldbm_back_db_config: %s: "
"line %d: frequency value (%d) invalid \"dbsync "
"<frequency> [<wait-times> [wait-interval]]\" line\n",
fname, lineno, i ));
fname, lineno, i );
#else
Debug( LDAP_DEBUG_ANY,
"%s: line %d: frquency value (%d) invalid \"dbsync <frequency> [<wait-times> [wait-interval]]\" line\n",
@ -177,8 +178,8 @@ ldbm_back_db_config(
#else
#ifdef NEW_LOGGING
LDAP_LOG (( "config", LDAP_LEVEL_ERR, "ldbm_back_db_config: \"dbsync\""
" policies not supported in non-threaded environments\n" ));
LDAP_LOG ( CONFIG, ERR, "ldbm_back_db_config: \"dbsync\""
" policies not supported in non-threaded environments\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"\"dbsync\" policies not supported in non-threaded environments\n", 0, 0, 0);

62
servers/slapd/back-ldbm/dbcache.c
View file

@ -54,8 +54,8 @@ ldbm_cache_open(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_ENTRY,
"ldbm_cache_open: \"%s\", %d, %o\n", buf, flags, li->li_mode ));
LDAP_LOG( CACHE, ENTRY,
"ldbm_cache_open: \"%s\", %d, %o\n", buf, flags, li->li_mode );
#else
Debug( LDAP_DEBUG_TRACE, "=> ldbm_cache_open( \"%s\", %d, %o )\n", buf,
flags, li->li_mode );
@ -101,8 +101,8 @@ ldbm_cache_open(
}
li->li_dbcache[i].dbc_refcnt++;
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
"ldbm_cache_open: cache %d\n", i ));
LDAP_LOG( CACHE, DETAIL1,
"ldbm_cache_open: cache %d\n", i, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"<= ldbm_cache_open (cache %d)\n", i, 0, 0 );
@ -132,8 +132,9 @@ ldbm_cache_open(
li->li_dbcache[i].dbc_name = NULL;
} else {
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_INFO,
"ldbm_cache_open: no unused db to close - waiting\n" ));
LDAP_LOG( CACHE, INFO,
"ldbm_cache_open: no unused db to close - waiting\n",
0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"ldbm_cache_open no unused db to close - waiting\n",
@ -155,10 +156,10 @@ ldbm_cache_open(
{
int err = errno;
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_ERR,
"ldbm_cache_open: \"%s\" failed, errono=%d, reason=%s\n",
buf, err, err > -1 && err < sys_nerr ? sys_errlist[err] :
"unknown" ));
LDAP_LOG( CACHE, ERR,
"ldbm_cache_open: \"%s\" failed, errono=%d, reason=%s\n",
buf, err, err > -1 && err < sys_nerr ? sys_errlist[err] :
"unknown" );
#else
Debug( LDAP_DEBUG_TRACE,
"<= ldbm_cache_open NULL \"%s\" errno=%d reason=\"%s\")\n",
@ -190,10 +191,10 @@ ldbm_cache_open(
assert( li->li_dbcache[i].dbc_maxindirect < 256 );
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_ARGS,
LDAP_LOG( CACHE, ARGS,
"ldbm_cache_open: blksize:%ld maxids:%d maxindirect:%d\n",
li->li_dbcache[i].dbc_blksize, li->li_dbcache[i].dbc_maxids,
li->li_dbcache[i].dbc_maxindirect ));
li->li_dbcache[i].dbc_maxindirect );
#else
Debug( LDAP_DEBUG_ARGS,
"ldbm_cache_open (blksize %ld) (maxids %d) (maxindirect %d)\n",
@ -202,8 +203,7 @@ ldbm_cache_open(
#endif
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
"<= ldbm_cache_open: (opened %d)\n", i ));
LDAP_LOG( CACHE, DETAIL1, "<= ldbm_cache_open: (opened %d)\n", i, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "<= ldbm_cache_open (opened %d)\n", i, 0, 0 );
#endif
@ -259,9 +259,9 @@ ldbm_cache_flush_all( Backend *be )
for ( i = 0; i < MAXDBCACHE; i++ ) {
if ( li->li_dbcache[i].dbc_name != NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
LDAP_LOG( CACHE, DETAIL1,
"ldbm_cache_flush_all: flushing db (%s)\n",
li->li_dbcache[i].dbc_name ));
li->li_dbcache[i].dbc_name, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldbm flushing db (%s)\n",
li->li_dbcache[i].dbc_name, 0, 0 );
@ -271,9 +271,9 @@ ldbm_cache_flush_all( Backend *be )
li->li_dbcache[i].dbc_dirty = 0;
if ( li->li_dbcache[i].dbc_refcnt != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_INFO,
"ldbm_cache_flush_all: couldn't close db (%s), refcnt=%d\n",
li->li_dbcache[i].dbc_name, li->li_dbcache[i].dbc_refcnt ));
LDAP_LOG( CACHE, INFO,
"ldbm_cache_flush_all: couldn't close db (%s), refcnt=%d\n",
li->li_dbcache[i].dbc_name, li->li_dbcache[i].dbc_refcnt,0);
#else
Debug( LDAP_DEBUG_TRACE,
"refcnt = %d, couldn't close db (%s)\n",
@ -283,9 +283,9 @@ ldbm_cache_flush_all( Backend *be )
} else {
#ifdef NEW_LOGGING
LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
LDAP_LOG( CACHE, DETAIL1,
"ldbm_cache_flush_all: ldbm closing db (%s)\n",
li->li_dbcache[i].dbc_name ));
li->li_dbcache[i].dbc_name, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"ldbm closing db (%s)\n",
@ -312,8 +312,8 @@ ldbm_cache_sync( Backend *be )
for ( i = 0; i < MAXDBCACHE; i++ ) {
if ( li->li_dbcache[i].dbc_name != NULL && li->li_dbcache[i].dbc_dirty ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "dbcache", LDAP_LEVEL_DETAIL1, "ldbm_cache_sync: "
"ldbm syncing db (%s)\n", li->li_dbcache[i].dbc_name ));
LDAP_LOG ( CACHE, DETAIL1, "ldbm_cache_sync: "
"ldbm syncing db (%s)\n", li->li_dbcache[i].dbc_name, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldbm syncing db (%s)\n",
li->li_dbcache[i].dbc_name, 0, 0 );
@ -391,8 +391,8 @@ ldbm_cache_sync_daemon(
struct ldbminfo *li = (struct ldbminfo *) be->be_private;
#ifdef NEW_LOGGING
LDAP_LOG (( "dbcache", LDAP_LEVEL_ARGS, "ldbm_cache_sync_daemon:"
" synchronizer starting for %s\n", li->li_directory ));
LDAP_LOG ( CACHE, ARGS, "ldbm_cache_sync_daemon:"
" synchronizer starting for %s\n", li->li_directory, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "synchronizer starting for %s\n", li->li_directory, 0, 0 );
#endif
@ -404,8 +404,8 @@ ldbm_cache_sync_daemon(
while (i && ldap_pvt_thread_pool_backload(&connection_pool) != 0) {
#ifdef NEW_LOGGING
LDAP_LOG (( "dbcache", LDAP_LEVEL_DETAIL1, "ldbm_cache_sync_daemon:"
" delay syncing %s\n", li->li_directory ));
LDAP_LOG ( CACHE, DETAIL1, "ldbm_cache_sync_daemon:"
" delay syncing %s\n", li->li_directory, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "delay syncing %s\n", li->li_directory, 0, 0 );
#endif
@ -415,8 +415,8 @@ ldbm_cache_sync_daemon(
if (!li->li_dbshutdown) {
#ifdef NEW_LOGGING
LDAP_LOG (( "dbcache", LDAP_LEVEL_DETAIL1, "ldbm_cache_sync_daemon:"
" syncing %s\n", li->li_directory ));
LDAP_LOG ( CACHE, DETAIL1, "ldbm_cache_sync_daemon:"
" syncing %s\n", li->li_directory, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "syncing %s\n", li->li_directory, 0, 0 );
#endif
@ -425,8 +425,8 @@ ldbm_cache_sync_daemon(
}
#ifdef NEW_LOGGING
LDAP_LOG (( "dbcache", LDAP_LEVEL_DETAIL1, "ldbm_cache_sync_daemon:"
" synchronizer stopping\n" ));
LDAP_LOG ( CACHE, DETAIL1, "ldbm_cache_sync_daemon:"
" synchronizer stopping\n", 0, 0, 0);
#else
Debug( LDAP_DEBUG_ANY, "synchronizer stopping\n", 0, 0, 0 );
#endif

44
servers/slapd/back-ldbm/delete.c
View file

@ -34,8 +34,7 @@ ldbm_back_delete(
AttributeDescription *children = slap_schema.si_ad_children;
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
"ldbm_back_delete: %s\n", dn->bv_val ));
LDAP_LOG( BACK_LDBM, ENTRY, "ldbm_back_delete: %s\n", dn->bv_val, 0, 0 );
#else
Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_delete: %s\n", dn->bv_val, 0, 0);
#endif
@ -49,8 +48,8 @@ ldbm_back_delete(
BerVarray refs;
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_delete: no such object %s\n", dn->bv_val ));
LDAP_LOG( BACK_LDBM, INFO,
"ldbm_back_delete: no such object %s\n", dn->bv_val, 0, 0 );
#else
Debug(LDAP_DEBUG_ARGS, "<=- ldbm_back_delete: no such object %s\n",
dn->bv_val, 0, 0);
@ -86,9 +85,8 @@ ldbm_back_delete(
conn, op, e );
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_delete: entry (%s) is a referral.\n",
e->e_dn ));
LDAP_LOG( BACK_LDBM, INFO,
"ldbm_back_delete: entry (%s) is a referral.\n", e->e_dn, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0,
0, 0 );
@ -106,8 +104,8 @@ ldbm_back_delete(
if ( has_children( be, e ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
"ldbm_back_delete: (%s) is a non-leaf node.\n", dn->bv_val ));
LDAP_LOG( BACK_LDBM, ERR,
"ldbm_back_delete: (%s) is a non-leaf node.\n", dn->bv_val, 0,0);
#else
Debug(LDAP_DEBUG_ARGS, "<=- ldbm_back_delete: non leaf %s\n",
dn->bv_val, 0, 0);
@ -123,8 +121,8 @@ ldbm_back_delete(
pdn.bv_len) ) {
if( (p = dn2entry_w( be, &pdn, NULL )) == NULL) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
"ldbm_back_delete: parent of (%s) does not exist\n", dn ));
LDAP_LOG( BACK_LDBM, ERR,
"ldbm_back_delete: parent of (%s) does not exist\n", dn, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"<=- ldbm_back_delete: parent does not exist\n",
@ -141,9 +139,9 @@ ldbm_back_delete(
children, NULL, ACL_WRITE, NULL ) )
{
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
"ldbm_back_delete: no access to parent of (%s)\n",
dn->bv_val ));
LDAP_LOG( BACK_LDBM, ERR,
"ldbm_back_delete: no access to parent of (%s)\n",
dn->bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"<=- ldbm_back_delete: no access to parent\n", 0,
@ -168,9 +166,9 @@ ldbm_back_delete(
/* check parent for "children" acl */
if ( ! rc ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
LDAP_LOG( BACK_LDBM, ERR,
"ldbm_back_delete: no access "
"to parent of ("")\n" ));
"to parent of ("")\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"<=- ldbm_back_delete: no "
@ -185,9 +183,9 @@ ldbm_back_delete(
} else {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
LDAP_LOG( BACK_LDBM, ERR,
"ldbm_back_delete: (%s) has no "
"parent & not a root.\n", dn ));
"parent & not a root.\n", dn, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"<=- ldbm_back_delete: no parent & "
@ -205,9 +203,8 @@ ldbm_back_delete(
/* delete from dn2id mapping */
if ( dn2id_delete( be, &e->e_nname, e->e_id ) != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
"ldbm_back_delete: (%s) operations error\n",
dn->bv_val ));
LDAP_LOG( BACK_LDBM, ERR,
"ldbm_back_delete: (%s) operations error\n", dn->bv_val, 0, 0 );
#else
Debug(LDAP_DEBUG_ARGS,
"<=- ldbm_back_delete: operations error %s\n",
@ -222,9 +219,8 @@ ldbm_back_delete(
/* delete from disk and cache */
if ( id2entry_delete( be, e ) != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
"ldbm_back_delete: (%s) operations error\n",
dn->bv_val ));
LDAP_LOG( BACK_LDBM, ERR,
"ldbm_back_delete: (%s) operations error\n", dn->bv_val, 0, 0 );
#else
Debug(LDAP_DEBUG_ARGS,
"<=- ldbm_back_delete: operations error %s\n",

55
servers/slapd/back-ldbm/dn2id.c
View file

@ -30,8 +30,7 @@ dn2id_add(
struct berval ptr, pdn;
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
"dn2id_add: (%s):%ld\n", dn->bv_val, id ));
LDAP_LOG( BACK_LDBM, ENTRY, "dn2id_add: (%s):%ld\n", dn->bv_val, id, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "=> dn2id_add( \"%s\", %ld )\n", dn->bv_val, id, 0 );
#endif
@ -41,8 +40,8 @@ dn2id_add(
if ( (db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT ))
== NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
"dn2id_add: couldn't open/create dn2id%s\n", LDBM_SUFFIX ));
LDAP_LOG( BACK_LDBM, ERR,
"dn2id_add: couldn't open/create dn2id%s\n", LDBM_SUFFIX, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "Could not open/create dn2id%s\n",
LDBM_SUFFIX, 0, 0 );
@ -104,8 +103,7 @@ dn2id_add(
ldbm_cache_close( be, db );
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
"dn2id_add: return %d\n", rc ));
LDAP_LOG( BACK_LDBM, ENTRY, "dn2id_add: return %d\n", rc, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "<= dn2id_add %d\n", rc, 0, 0 );
#endif
@ -125,8 +123,7 @@ dn2id(
Datum key, data;
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
"dn2id: (%s)\n", dn->bv_val ));
LDAP_LOG( BACK_LDBM, ENTRY, "dn2id: (%s)\n", dn->bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "=> dn2id( \"%s\" )\n", dn->bv_val, 0, 0 );
#endif
@ -136,8 +133,7 @@ dn2id(
/* first check the cache */
if ( (*idp = cache_find_entry_ndn2id( be, &li->li_cache, dn )) != NOID ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"dn2id: (%s)%ld in cache.\n", dn, *idp ));
LDAP_LOG( BACK_LDBM, DETAIL1, "dn2id: (%s)%ld in cache.\n", dn, *idp, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "<= dn2id %ld (in cache)\n", *idp,
0, 0 );
@ -149,8 +145,8 @@ dn2id(
if ( (db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT ))
== NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
"dn2id: couldn't open dn2id%s\n", LDBM_SUFFIX ));
LDAP_LOG( BACK_LDBM, ERR,
"dn2id: couldn't open dn2id%s\n", LDBM_SUFFIX, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "<= dn2id could not open dn2id%s\n",
LDBM_SUFFIX, 0, 0 );
@ -177,8 +173,7 @@ dn2id(
if ( data.dptr == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"dn2id: (%s) NOID\n", dn ));
LDAP_LOG( BACK_LDBM, INFO, "dn2id: (%s) NOID\n", dn, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "<= dn2id NOID\n", 0, 0, 0 );
#endif
@ -194,8 +189,7 @@ dn2id(
ldbm_datum_free( db->dbc_db, data );
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
"dn2id: %ld\n", *idp ));
LDAP_LOG( BACK_LDBM, ENTRY, "dn2id: %ld\n", *idp, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "<= dn2id %ld\n", *idp, 0, 0 );
#endif
@ -215,8 +209,7 @@ dn2idl(
Datum key;
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
"dn2idl: \"%c%s\"\n", prefix, dn->bv_val ));
LDAP_LOG( BACK_LDBM, ENTRY, "dn2idl: \"%c%s\"\n", prefix, dn->bv_val, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "=> dn2idl( \"%c%s\" )\n", prefix, dn->bv_val, 0 );
#endif
@ -232,8 +225,8 @@ dn2idl(
if ( (db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT ))
== NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
"dn2idl: could not open dn2id%s\n", LDBM_SUFFIX ));
LDAP_LOG( BACK_LDBM, ERR,
"dn2idl: could not open dn2id%s\n", LDBM_SUFFIX, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "<= dn2idl could not open dn2id%s\n",
LDBM_SUFFIX, 0, 0 );
@ -272,8 +265,8 @@ dn2id_delete(
struct berval ptr, pdn;
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
"dn2id_delete: (%s)%ld\n", dn->bv_val, id ));
LDAP_LOG( BACK_LDBM, ENTRY,
"dn2id_delete: (%s)%ld\n", dn->bv_val, id, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "=> dn2id_delete( \"%s\", %ld )\n", dn->bv_val, id, 0 );
#endif
@ -284,8 +277,8 @@ dn2id_delete(
if ( (db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT ))
== NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
"dn2id_delete: couldn't open db2id%s\n", LDBM_SUFFIX ));
LDAP_LOG( BACK_LDBM, ERR,
"dn2id_delete: couldn't open db2id%s\n", LDBM_SUFFIX, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"<= dn2id_delete could not open dn2id%s\n", LDBM_SUFFIX,
@ -342,8 +335,7 @@ dn2id_delete(
ldbm_cache_close( be, db );
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
"dn2id_delete: return %d\n", rc ));
LDAP_LOG( BACK_LDBM, ENTRY, "dn2id_delete: return %d\n", rc, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "<= dn2id_delete %d\n", rc, 0, 0 );
#endif
@ -369,9 +361,8 @@ dn2entry_rw(
struct berval pdn;
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
"dn2entry_rw: %s entry %s\n", rw ? "w" : "r",
dn->bv_val ));
LDAP_LOG( BACK_LDBM, ENTRY,
"dn2entry_rw: %s entry %s\n", rw ? "w" : "r", dn->bv_val, 0 );
#else
Debug(LDAP_DEBUG_TRACE, "dn2entry_%s: dn: \"%s\"\n",
rw ? "w" : "r", dn->bv_val, 0);
@ -394,9 +385,9 @@ dn2entry_rw(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
"dn2entry_rw: no entry for valid id (%ld), dn (%s)\n",
id, dn->bv_val ));
LDAP_LOG( BACK_LDBM, ERR,
"dn2entry_rw: no entry for valid id (%ld), dn (%s)\n",
id, dn->bv_val, 0 );
#else
Debug(LDAP_DEBUG_ANY,
"dn2entry_%s: no entry for valid id (%ld), dn \"%s\"\n",

198
servers/slapd/back-ldbm/filterindex.c
View file

@ -39,7 +39,7 @@ filter_candidates(
ID_BLOCK *result;
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY, "filter_candidates: enter\n"));
LDAP_LOG( FILTER, ENTRY, "filter_candidates: enter\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "=> filter_candidates\n", 0, 0, 0 );
#endif
@ -49,8 +49,8 @@ filter_candidates(
switch ( f->f_choice ) {
case SLAPD_FILTER_DN_ONE:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"filter_candidates: DN ONE (%s)\n", f->f_dn ));
LDAP_LOG( FILTER, DETAIL1,
"filter_candidates: DN ONE (%s)\n", f->f_dn, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "\tDN ONE\n", 0, 0, 0 );
#endif
@ -65,8 +65,8 @@ filter_candidates(
case SLAPD_FILTER_DN_SUBTREE:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"filter_candidates: DN SUBTREE (%s)\n", f->f_dn ));
LDAP_LOG( FILTER, DETAIL1,
"filter_candidates: DN SUBTREE (%s)\n", f->f_dn, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "\tDN SUBTREE\n", 0, 0, 0 );
#endif
@ -81,8 +81,9 @@ filter_candidates(
case LDAP_FILTER_PRESENT:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"filter_candidates: Present (%s)\n", f->f_desc->ad_cname.bv_val ));
LDAP_LOG( FILTER, DETAIL1,
"filter_candidates: Present (%s)\n",
f->f_desc->ad_cname.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "\tPRESENT\n", 0, 0, 0 );
#endif
@ -92,10 +93,10 @@ filter_candidates(
case LDAP_FILTER_EQUALITY:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
LDAP_LOG( FILTER, DETAIL1,
"filter_candidates: EQUALITY (%s),(%s)\n",
f->f_ava->aa_desc->ad_cname.bv_val,
f->f_ava->aa_value.bv_val ));
f->f_ava->aa_value.bv_val, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "\tEQUALITY\n", 0, 0, 0 );
#endif
@ -105,10 +106,10 @@ filter_candidates(
case LDAP_FILTER_APPROX:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
LDAP_LOG( FILTER, DETAIL1,
"filter_candidates: APPROX (%s), (%s)\n",
f->f_ava->aa_desc->ad_cname.bv_val,
f->f_ava->aa_value.bv_val ));
f->f_ava->aa_value.bv_val, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "\tAPPROX\n", 0, 0, 0 );
#endif
@ -118,8 +119,8 @@ filter_candidates(
case LDAP_FILTER_SUBSTRINGS:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"filter_candidates: SUBSTRINGS\n"));
LDAP_LOG( FILTER, DETAIL1,
"filter_candidates: SUBSTRINGS\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "\tSUBSTRINGS\n", 0, 0, 0 );
#endif
@ -129,8 +130,7 @@ filter_candidates(
case LDAP_FILTER_GE:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"filter_candidates: GE\n"));
LDAP_LOG( FILTER, DETAIL1, "filter_candidates: GE\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "\tGE\n", 0, 0, 0 );
#endif
@ -140,8 +140,7 @@ filter_candidates(
case LDAP_FILTER_LE:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"filter_candidates: LE\n" ));
LDAP_LOG( FILTER, DETAIL1, "filter_candidates: LE\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "\tLE\n", 0, 0, 0 );
#endif
@ -151,8 +150,7 @@ filter_candidates(
case LDAP_FILTER_AND:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"filter_candidates: AND\n" ));
LDAP_LOG( FILTER, DETAIL1, "filter_candidates: AND\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "\tAND\n", 0, 0, 0 );
#endif
@ -162,8 +160,7 @@ filter_candidates(
case LDAP_FILTER_OR:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"filter_candidates: OR\n" ));
LDAP_LOG( FILTER, DETAIL1, "filter_candidates: OR\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "\tOR\n", 0, 0, 0 );
#endif
@ -173,8 +170,7 @@ filter_candidates(
case LDAP_FILTER_NOT:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"filter_candidates: NOT\n" ));
LDAP_LOG( FILTER, DETAIL1, "filter_candidates: NOT\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "\tNOT\n", 0, 0, 0 );
#endif
@ -189,8 +185,7 @@ filter_candidates(
break;
default:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"filter_candidates: UNKNOWN\n" ));
LDAP_LOG( FILTER, DETAIL1, "filter_candidates: UNKNOWN\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "\tUNKNOWN\n", 0, 0, 0 );
#endif
@ -202,9 +197,9 @@ filter_candidates(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"filter_candidates: return %ld\n",
result ? ID_BLOCK_NIDS(result) : 0 ));
LDAP_LOG( FILTER, ENTRY,
"filter_candidates: return %ld\n",
result ? ID_BLOCK_NIDS(result) : 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "<= filter_candidates %ld\n",
result ? ID_BLOCK_NIDS(result) : 0, 0, 0 );
@ -227,8 +222,7 @@ presence_candidates(
struct berval prefix = {0};
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"presence_candidates: enter\n" ));
LDAP_LOG( FILTER, ENTRY, "presence_candidates: enter\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "=> presence_candidates\n", 0, 0, 0 );
#endif
@ -244,9 +238,8 @@ presence_candidates(
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_INFO,
"presence_candidates: index_param returned %d\n",
rc ));
LDAP_LOG( FILTER, INFO,
"presence_candidates: index_param returned %d\n", rc, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"<= presence_candidates: index_param returned=%d\n",
@ -259,8 +252,7 @@ presence_candidates(
if( dbname == NULL ) {
/* not indexed */
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_INFO,
"presence_candidates: not indexed\n" ));
LDAP_LOG( FILTER, INFO, "presence_candidates: not indexed\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"<= presense_candidates: not indexed\n",
@ -274,9 +266,9 @@ presence_candidates(
if ( db == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_INFO,
LDAP_LOG( FILTER, INFO,
"presence_candidates: db open failed (%s%s)\n",
dbname, LDBM_SUFFIX ));
dbname, LDBM_SUFFIX, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"<= presense_candidates db open failed (%s%s)\n",
@ -294,8 +286,8 @@ presence_candidates(
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
"presence_candidates: key read failed (%d)\n", rc ));
LDAP_LOG( FILTER, ERR,
"presence_candidates: key read failed (%d)\n", rc, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"<= presense_candidates key read failed (%d)\n",
@ -305,8 +297,7 @@ presence_candidates(
} else if( idl == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"presence_candidates: NULL\n" ));
LDAP_LOG( FILTER, DETAIL1, "presence_candidates: NULL\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"<= presense_candidates NULL\n",
@ -319,9 +310,9 @@ presence_candidates(
ldbm_cache_close( be, db );
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"presence_candidates: return %ld\n",
idl ? ID_BLOCK_NIDS(idl) : 0 ));
LDAP_LOG( FILTER, ENTRY,
"presence_candidates: return %ld\n",
idl ? ID_BLOCK_NIDS(idl) : 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "<= presence_candidates %ld\n",
idl ? ID_BLOCK_NIDS(idl) : 0, 0, 0 );
@ -347,8 +338,7 @@ equality_candidates(
MatchingRule *mr;
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"equality_candidates: enter\n" ));
LDAP_LOG( FILTER, ENTRY, "equality_candidates: enter\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "=> equality_candidates\n", 0, 0, 0 );
#endif
@ -361,8 +351,8 @@ equality_candidates(
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
"equality_candidates: index_param returned %d\n", rc ));
LDAP_LOG( FILTER, ERR,
"equality_candidates: index_param returned %d\n", rc, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"<= equality_candidates: index_param returned=%d\n",
@ -375,8 +365,7 @@ equality_candidates(
if( dbname == NULL ) {
/* not indexed */
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
"equality_candidates: not indexed\n" ));
LDAP_LOG( FILTER, ERR, "equality_candidates: not indexed\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"<= equality_candidates: not indexed\n",
@ -406,9 +395,9 @@ equality_candidates(
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
LDAP_LOG( FILTER, ERR,
"equality_candidates: (%s%s) MR filter failed (%d\n",
dbname, LDBM_SUFFIX, rc ));
dbname, LDBM_SUFFIX, rc );
#else
Debug( LDAP_DEBUG_TRACE,
"<= equality_candidates: (%s%s) MR filter failed (%d)\n",
@ -420,9 +409,8 @@ equality_candidates(
if( keys == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
"equality_candidates: no keys (%s%s)\n",
dbname, LDBM_SUFFIX ));
LDAP_LOG( FILTER, ERR,
"equality_candidates: no keys (%s%s)\n", dbname, LDBM_SUFFIX, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"<= equality_candidates: no keys (%s%s)\n",
@ -436,9 +424,8 @@ equality_candidates(
if ( db == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
"equality_candidates: db open failed (%s%s)\n",
dbname, LDBM_SUFFIX ));
LDAP_LOG( FILTER, ERR, "equality_candidates: db open failed (%s%s)\n",
dbname, LDBM_SUFFIX, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"<= equality_candidates db open failed (%s%s)\n",
@ -458,8 +445,8 @@ equality_candidates(
idl_free( idl );
idl = NULL;
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
"equality_candidates: key read failed (%d)\n", rc ));
LDAP_LOG( FILTER, ERR,
"equality_candidates: key read failed (%d)\n", rc, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"<= equality_candidates key read failed (%d)\n",
@ -473,8 +460,7 @@ equality_candidates(
idl_free( idl );
idl = NULL;
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_INFO,
"equality_candidates NULL\n" ));
LDAP_LOG( FILTER, INFO, "equality_candidates NULL\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"<= equality_candidates NULL\n",
@ -498,9 +484,9 @@ equality_candidates(
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"equality_candidates: return %ld\n",
idl ? ID_BLOCK_NIDS(idl) : 0 ));
LDAP_LOG( FILTER, ENTRY,
"equality_candidates: return %ld\n",
idl ? ID_BLOCK_NIDS(idl) : 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "<= equality_candidates %ld\n",
idl ? ID_BLOCK_NIDS(idl) : 0, 0, 0 );
@ -526,8 +512,7 @@ approx_candidates(
MatchingRule *mr;
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"approx_candidates: enter\n" ));
LDAP_LOG( FILTER, ENTRY, "approx_candidates: enter\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "=> approx_candidates\n", 0, 0, 0 );
#endif
@ -540,8 +525,8 @@ approx_candidates(
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
"approx_candidates: index_param returned %d\n", rc ));
LDAP_LOG( FILTER, ERR,
"approx_candidates: index_param returned %d\n", rc, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"<= approx_candidates: index_param returned=%d\n",
@ -554,8 +539,7 @@ approx_candidates(
if( dbname == NULL ) {
/* not indexed */
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
"approx_candidates: not indexed\n" ));
LDAP_LOG( FILTER, ERR, "approx_candidates: not indexed\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"<= approx_candidates: not indexed\n",
@ -590,9 +574,9 @@ approx_candidates(
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
LDAP_LOG( FILTER, ERR,
"approx_candidates: (%s%s) MR filter failed (%d)\n",
dbname, LDBM_SUFFIX, rc ));
dbname, LDBM_SUFFIX, rc );
#else
Debug( LDAP_DEBUG_TRACE,
"<= approx_candidates: (%s%s) MR filter failed (%d)\n",
@ -604,9 +588,9 @@ approx_candidates(
if( keys == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_INFO,
LDAP_LOG( FILTER, INFO,
"approx_candidates: no keys (%s%s)\n",
dbname, LDBM_SUFFIX ));
dbname, LDBM_SUFFIX, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"<= approx_candidates: no keys (%s%s)\n",
@ -620,9 +604,9 @@ approx_candidates(
if ( db == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
"approx_candidates db open failed (%s%s)\n",
dbname, LDBM_SUFFIX ));
LDAP_LOG( FILTER, ERR,
"approx_candidates db open failed (%s%s)\n",
dbname, LDBM_SUFFIX, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"<= approx_candidates db open failed (%s%s)\n",
@ -642,8 +626,8 @@ approx_candidates(
idl_free( idl );
idl = NULL;
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
"approx_candidates: key read failed (%d)\n", rc ));
LDAP_LOG( FILTER, ERR,
"approx_candidates: key read failed (%d)\n", rc, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "<= approx_candidates key read failed (%d)\n",
rc, 0, 0 );
@ -656,8 +640,7 @@ approx_candidates(
idl_free( idl );
idl = NULL;
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_INFO,
"approx_candidates: NULL\n" ));
LDAP_LOG( FILTER, INFO, "approx_candidates: NULL\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "<= approx_candidates NULL\n",
0, 0, 0 );
@ -679,9 +662,9 @@ approx_candidates(
ldbm_cache_close( be, db );
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"approx_candidates: return %ld\n",
idl ? ID_BLOCK_NIDS(idl) : 0 ));
LDAP_LOG( FILTER, ENTRY,
"approx_candidates: return %ld\n",
idl ? ID_BLOCK_NIDS(idl) : 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "<= approx_candidates %ld\n",
idl ? ID_BLOCK_NIDS(idl) : 0, 0, 0 );
@ -701,8 +684,7 @@ list_candidates(
Filter *f;
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"list_candidates: 0x%x\n", ftype ));
LDAP_LOG( FILTER, ENTRY, "list_candidates: 0x%x\n", ftype, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "=> list_candidates 0x%x\n", ftype, 0, 0 );
#endif
@ -713,8 +695,7 @@ list_candidates(
if ( (tmp = filter_candidates( be, f )) == NULL &&
ftype == LDAP_FILTER_AND ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_INFO,
"list_candidates: NULL\n" ));
LDAP_LOG( FILTER, INFO, "list_candidates: NULL\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"<= list_candidates NULL\n", 0, 0, 0 );
@ -739,9 +720,8 @@ list_candidates(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"list_candidates: return %ld\n",
idl ? ID_BLOCK_NIDS(idl) : 0 ));
LDAP_LOG( FILTER, ENTRY, "list_candidates: return %ld\n",
idl ? ID_BLOCK_NIDS(idl) : 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "<= list_candidates %ld\n",
idl ? ID_BLOCK_NIDS(idl) : 0, 0, 0 );
@ -767,8 +747,7 @@ substring_candidates(
MatchingRule *mr;
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"substrings_candidates: enter\n" ));
LDAP_LOG( FILTER, ENTRY, "substrings_candidates: enter\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "=> substrings_candidates\n", 0, 0, 0 );
#endif
@ -781,8 +760,8 @@ substring_candidates(
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
"substrings_candidates: index_param returned %d\n", rc ));
LDAP_LOG( FILTER, ERR,
"substrings_candidates: index_param returned %d\n", rc, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"<= substrings_candidates: index_param returned=%d\n",
@ -795,8 +774,7 @@ substring_candidates(
if( dbname == NULL ) {
/* not indexed */
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
"substrings_candidates: not indexed\n" ));
LDAP_LOG( FILTER, ERR, "substrings_candidates: not indexed\n", 0, 0, 0);
#else
Debug( LDAP_DEBUG_ANY,
"<= substrings_candidates: not indexed\n",
@ -827,9 +805,9 @@ substring_candidates(
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
LDAP_LOG( FILTER, ERR,
"substrings_candidates: (%s%s) MR filter failed (%d)\n",
dbname, LDBM_SUFFIX, rc ));
dbname, LDBM_SUFFIX, rc );
#else
Debug( LDAP_DEBUG_TRACE,
"<= substrings_candidates: (%s%s) MR filter failed (%d)\n",
@ -841,9 +819,9 @@ substring_candidates(
if( keys == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
LDAP_LOG( FILTER, ERR,
"substrings_candidates: (0x%04lx) no keys (%s%s)\n",
mask, dbname, LDBM_SUFFIX ));
mask, dbname, LDBM_SUFFIX );
#else
Debug( LDAP_DEBUG_TRACE,
"<= substrings_candidates: (0x%04lx) no keys (%s%s)\n",
@ -857,9 +835,9 @@ substring_candidates(
if ( db == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
LDAP_LOG( FILTER, ERR,
"substrings_candidates: db open failed (%s%s)\n",
dbname, LDBM_SUFFIX ));
dbname, LDBM_SUFFIX, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"<= substrings_candidates db open failed (%s%s)\n",
@ -879,9 +857,8 @@ substring_candidates(
idl_free( idl );
idl = NULL;
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
"substrings_candidates: key read failed (%d)\n",
rc ));
LDAP_LOG( FILTER, ERR,
"substrings_candidates: key read failed (%d)\n", rc, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "<= substrings_candidates key read failed (%d)\n",
rc, 0, 0 );
@ -894,8 +871,7 @@ substring_candidates(
idl_free( idl );
idl = NULL;
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_INFO,
"substrings_candidates: NULL\n" ));
LDAP_LOG( FILTER, INFO, "substrings_candidates: NULL\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "<= substrings_candidates NULL\n",
0, 0, 0 );
@ -917,9 +893,9 @@ substring_candidates(
ldbm_cache_close( be, db );
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
LDAP_LOG( FILTER, ENTRY,
"substrings_candidates: return %ld\n",
idl ? ID_BLOCK_NIDS(idl) : 0 ));
idl ? ID_BLOCK_NIDS(idl) : 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "<= substrings_candidates %ld\n",
idl ? ID_BLOCK_NIDS(idl) : 0, 0, 0 );

52
servers/slapd/back-ldbm/group.c
View file

@ -48,9 +48,9 @@ ldbm_back_group(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
LDAP_LOG( BACK_LDBM, ENTRY,
"ldbm_back_group: check (%s) member of (%s), oc %s\n",
op_ndn->bv_val, gr_ndn->bv_val, group_oc_name ));
op_ndn->bv_val, gr_ndn->bv_val, group_oc_name );
#else
Debug( LDAP_DEBUG_ARGS,
"=> ldbm_back_group: gr dn: \"%s\"\n",
@ -72,9 +72,8 @@ ldbm_back_group(
/* we already have a LOCKED copy of the entry */
e = target;
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"ldbm_back_group: target is group (%s)\n",
gr_ndn->bv_val ));
LDAP_LOG( BACK_LDBM, DETAIL1,
"ldbm_back_group: target is group (%s)\n", gr_ndn->bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ARGS,
"=> ldbm_back_group: target is group: \"%s\"\n",
@ -86,9 +85,9 @@ ldbm_back_group(
/* can we find group entry with reader lock */
if ((e = dn2entry_r(be, gr_ndn, NULL )) == NULL) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"ldbm_back_group: cannot find group (%s)\n",
gr_ndn->bv_val ));
LDAP_LOG( BACK_LDBM, DETAIL1,
"ldbm_back_group: cannot find group (%s)\n",
gr_ndn->bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ACL,
"=> ldbm_back_group: cannot find group: \"%s\"\n",
@ -99,8 +98,8 @@ ldbm_back_group(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"ldbm_back_group: found group (%s)\n", gr_ndn->bv_val ));
LDAP_LOG( BACK_LDBM, DETAIL1,
"ldbm_back_group: found group (%s)\n", gr_ndn->bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ACL,
"=> ldbm_back_group: found group: \"%s\"\n",
@ -119,9 +118,8 @@ ldbm_back_group(
if( is_entry_alias( e ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_group: group (%s) is an alias\n",
gr_ndn->bv_val ));
LDAP_LOG( BACK_LDBM, INFO,
"ldbm_back_group: group (%s) is an alias\n", gr_ndn->bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ACL,
"<= ldbm_back_group: group is an alias\n", 0, 0, 0 );
@ -132,9 +130,8 @@ ldbm_back_group(
if( is_entry_referral( e ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_group: group (%s) is a referral.\n",
gr_ndn->bv_val ));
LDAP_LOG( BACK_LDBM, INFO,
"ldbm_back_group: group (%s) is a referral.\n", gr_ndn->bv_val,0,0);
#else
Debug( LDAP_DEBUG_ACL,
"<= ldbm_back_group: group is an referral\n", 0, 0, 0 );
@ -145,9 +142,9 @@ ldbm_back_group(
if( !is_entry_objectclass( e, group_oc, 0 ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
LDAP_LOG( BACK_LDBM, ERR,
"ldbm_back_group: failed to find %s in objectClass.\n",
group_oc_name ));
group_oc_name, 0, 0 );
#else
Debug( LDAP_DEBUG_ACL,
"<= ldbm_back_group: failed to find %s in objectClass\n",
@ -159,8 +156,8 @@ ldbm_back_group(
if ((attr = attr_find(e->e_attrs, group_at)) == NULL) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_group: failed to find %s\n", group_at_name ));
LDAP_LOG( BACK_LDBM, INFO,
"ldbm_back_group: failed to find %s\n", group_at_name, 0, 0 );
#else
Debug( LDAP_DEBUG_ACL,
"<= ldbm_back_group: failed to find %s\n",
@ -171,9 +168,9 @@ ldbm_back_group(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
LDAP_LOG( BACK_LDBM, ENTRY,
"ldbm_back_group: found objectClass %s and %s\n",
group_oc_name, group_at_name ));
group_oc_name, group_at_name, 0 );
#else
Debug( LDAP_DEBUG_ACL,
"<= ldbm_back_group: found objectClass %s and %s\n",
@ -183,9 +180,9 @@ ldbm_back_group(
if( value_find( group_at, attr->a_vals, op_ndn ) != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
LDAP_LOG( BACK_LDBM, DETAIL1,
"ldbm_back_group: \"%s\" not in \"%s\": %s\n",
op_ndn->bv_val, gr_ndn->bv_val, group_at_name ));
op_ndn->bv_val, gr_ndn->bv_val, group_at_name );
#else
Debug( LDAP_DEBUG_ACL,
"<= ldbm_back_group: \"%s\" not in \"%s\": %s\n",
@ -197,9 +194,9 @@ ldbm_back_group(
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
LDAP_LOG( BACK_LDBM, DETAIL1,
"ldbm_back_group: %s is in %s: %s\n",
op_ndn->bv_val, gr_ndn->bv_val, group_at_name ));
op_ndn->bv_val, gr_ndn->bv_val, group_at_name );
#else
Debug( LDAP_DEBUG_ACL,
"<= ldbm_back_group: \"%s\" is in \"%s\": %s\n",
@ -216,8 +213,7 @@ return_results:
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
"ldbm_back_group: rc=%d\n", rc ));
LDAP_LOG( BACK_LDBM, ENTRY, "ldbm_back_group: rc=%d\n", rc, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldbm_back_group: rc=%d\n", rc, 0, 0 );
#endif

13
servers/slapd/back-ldbm/id2children.c
View file

@ -15,7 +15,6 @@
#include "slap.h"
#include "back-ldbm.h"
int
has_children(
Backend *be,
@ -30,8 +29,7 @@ has_children(
ldbm_datum_init( key );
#ifdef NEW_LOGGING
LDAP_LOG(( "id2children", LDAP_LEVEL_ENTRY,
"has_children: enter %ld\n", p->e_id ));
LDAP_LOG( INDEX, ENTRY, "has_children: enter %ld\n", p->e_id, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "=> has_children( %ld )\n", p->e_id , 0, 0 );
#endif
@ -40,9 +38,8 @@ has_children(
if ( (db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX,
LDBM_WRCREAT )) == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "id2children", LDAP_LEVEL_ERR,
"has_children: could not open \"dn2id%s\"\n",
LDBM_SUFFIX ));
LDAP_LOG( INDEX, ERR,
"has_children: could not open \"dn2id%s\"\n", LDBM_SUFFIX, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"<= has_children -1 could not open \"dn2id%s\"\n",
@ -68,9 +65,9 @@ has_children(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "id2children", LDAP_LEVEL_ENTRY,
LDAP_LOG( INDEX, ENTRY,
"has_children: id (%ld) %s children.\n",
p->e_id, rc ? "has" : "doesn't have" ));
p->e_id, rc ? "has" : "doesn't have", 0 );
#else
Debug( LDAP_DEBUG_TRACE, "<= has_children( %ld ): %s\n",
p->e_id, rc ? "yes" : "no", 0 );

60
servers/slapd/back-ldbm/id2entry.c
View file

@ -33,8 +33,7 @@ id2entry_add( Backend *be, Entry *e )
ldbm_datum_init( data );
#ifdef NEW_LOGGING
LDAP_LOG(( "id2entry", LDAP_LEVEL_ENTRY,
"id2entry_add: (%s)%ld\n", e->e_dn, e->e_id ));
LDAP_LOG( INDEX, ENTRY, "id2entry_add: (%s)%ld\n", e->e_dn, e->e_id, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "=> id2entry_add( %ld, \"%s\" )\n", e->e_id,
e->e_dn, 0 );
@ -44,9 +43,9 @@ id2entry_add( Backend *be, Entry *e )
if ( (db = ldbm_cache_open( be, "id2entry", LDBM_SUFFIX, LDBM_WRCREAT ))
== NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "id2entry", LDAP_LEVEL_ERR,
"id2entry_add: could not open/create id2entry%s\n",
LDBM_SUFFIX ));
LDAP_LOG( INDEX, ERR,
"id2entry_add: could not open/create id2entry%s\n",
LDBM_SUFFIX, 0,0 );
#else
Debug( LDAP_DEBUG_ANY, "Could not open/create id2entry%s\n",
LDBM_SUFFIX, 0, 0 );
@ -76,8 +75,7 @@ id2entry_add( Backend *be, Entry *e )
ldbm_cache_close( be, db );
#ifdef NEW_LOGGING
LDAP_LOG(( "id2entry", LDAP_LEVEL_ENTRY,
"id2entry_add: return %d\n", rc ));
LDAP_LOG( INDEX, ENTRY, "id2entry_add: return %d\n", rc, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "<= id2entry_add %d\n", rc, 0, 0 );
#endif
@ -98,8 +96,7 @@ id2entry_delete( Backend *be, Entry *e )
#endif
#ifdef NEW_LOGGING
LDAP_LOG(( "id2entry", LDAP_LEVEL_ENTRY,
"id2entry_delete: (%s)%ld\n", e->e_dn, e->e_id ));
LDAP_LOG( INDEX, ENTRY, "id2entry_delete: (%s)%ld\n", e->e_dn, e->e_id, 0 );
#else
Debug(LDAP_DEBUG_TRACE, "=> id2entry_delete( %ld, \"%s\" )\n", e->e_id,
e->e_dn, 0 );
@ -118,9 +115,9 @@ id2entry_delete( Backend *be, Entry *e )
if ( (db = ldbm_cache_open( be, "id2entry", LDBM_SUFFIX, LDBM_WRCREAT ))
== NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "id2entry", LDAP_LEVEL_ERR,
LDAP_LOG( INDEX, ERR,
"id2entry_delete: could not open/create id2entry%s\n",
LDBM_SUFFIX ));
LDBM_SUFFIX, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "Could not open/create id2entry%s\n",
LDBM_SUFFIX, 0, 0 );
@ -131,9 +128,9 @@ id2entry_delete( Backend *be, Entry *e )
if ( cache_delete_entry( &li->li_cache, e ) != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "id2entry", LDAP_LEVEL_ERR,
LDAP_LOG( INDEX, ERR,
"id2entry_delete: Could not delete (%s)%ld from cache\n",
e->e_dn, e->e_id ));
e->e_dn, e->e_id, 0 );
#else
Debug(LDAP_DEBUG_ANY, "could not delete %ld (%s) from cache\n",
e->e_id, e->e_dn, 0 );
@ -154,8 +151,7 @@ id2entry_delete( Backend *be, Entry *e )
ldbm_cache_close( be, db );
#ifdef NEW_LOGGING
LDAP_LOG(( "id2entry", LDAP_LEVEL_ENTRY,
"id2entry_delete: return %d\n", rc ));
LDAP_LOG( INDEX, ENTRY, "id2entry_delete: return %d\n", rc, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "<= id2entry_delete %d\n", rc, 0, 0 );
#endif
@ -179,9 +175,8 @@ id2entry_rw( Backend *be, ID id, int rw )
ldbm_datum_init( data );
#ifdef NEW_LOGGING
LDAP_LOG(( "id2entry", LDAP_LEVEL_ENTRY,
"id2entry_rw: %s (%ld)\n",
rw ? "write" : "read", id ));
LDAP_LOG( INDEX, ENTRY,
"id2entry_rw: %s (%ld)\n", rw ? "write" : "read", id, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "=> id2entry_%s( %ld )\n",
rw ? "w" : "r", id, 0 );
@ -190,9 +185,9 @@ id2entry_rw( Backend *be, ID id, int rw )
if ( (e = cache_find_entry_id( &li->li_cache, id, rw )) != NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "id2entry", LDAP_LEVEL_DETAIL1,
LDAP_LOG( INDEX, DETAIL1,
"id2entry_rw: %s (%ld) 0x%lx (cache).\n",
rw ? "write" : "read", id, (unsigned long)e ));
rw ? "write" : "read", id, (unsigned long)e );
#else
Debug( LDAP_DEBUG_TRACE, "<= id2entry_%s( %ld ) 0x%lx (cache)\n",
rw ? "w" : "r", id, (unsigned long) e );
@ -204,8 +199,8 @@ id2entry_rw( Backend *be, ID id, int rw )
if ( (db = ldbm_cache_open( be, "id2entry", LDBM_SUFFIX, LDBM_WRCREAT ))
== NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "id2entry", LDAP_LEVEL_ERR,
"id2entry_rw: could not open id2entry%s\n", LDBM_SUFFIX ));
LDAP_LOG( INDEX, ERR,
"id2entry_rw: could not open id2entry%s\n", LDBM_SUFFIX, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "Could not open id2entry%s\n",
LDBM_SUFFIX, 0, 0 );
@ -226,8 +221,8 @@ id2entry_rw( Backend *be, ID id, int rw )
if ( data.dptr == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "id2entry", LDAP_LEVEL_ERR,
"id2entry_rw: (%ld) not found\n", id ));
LDAP_LOG( INDEX, ERR,
"id2entry_rw: (%ld) not found\n", id, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "<= id2entry_%s( %ld ) not found\n",
rw ? "w" : "r", id, 0 );
@ -243,9 +238,8 @@ id2entry_rw( Backend *be, ID id, int rw )
if ( e == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "id2entry", LDAP_LEVEL_ERR,
"id2entry_rw: %s of %ld failed\n",
rw ? "write" : "read", id ));
LDAP_LOG( INDEX, ERR,
"id2entry_rw: %s of %ld failed\n", rw ? "write" : "read", id, 0);
#else
Debug( LDAP_DEBUG_TRACE, "<= id2entry_%s( %ld ) (failed)\n",
rw ? "w" : "r", id, 0 );
@ -265,9 +259,9 @@ id2entry_rw( Backend *be, ID id, int rw )
*/
if ( (e = cache_find_entry_id( &li->li_cache, id, rw )) != NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "id2entry", LDAP_LEVEL_DETAIL1,
LDAP_LOG( INDEX, DETAIL1,
"id2entry_rw: %s of %ld 0x%lx (cache)\n",
rw ? "write" : "read", id, (unsigned long)e ));
rw ? "write" : "read", id, (unsigned long)e );
#else
Debug( LDAP_DEBUG_TRACE, "<= id2entry_%s( %ld ) 0x%lx (cache)\n",
rw ? "w" : "r", id, (unsigned long) e );
@ -277,9 +271,9 @@ id2entry_rw( Backend *be, ID id, int rw )
}
#ifdef NEW_LOGGING
LDAP_LOG(( "id2entry", LDAP_LEVEL_ERR,
LDAP_LOG( INDEX, ERR,
"id2entry_rw: %s of %ld (cache add failed)\n",
rw ? "write" : "read", id ));
rw ? "write" : "read", id, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "<= id2entry_%s( %ld ) (cache add failed)\n",
rw ? "w" : "r", id, 0 );
@ -289,9 +283,9 @@ id2entry_rw( Backend *be, ID id, int rw )
}
#ifdef NEW_LOGGING
LDAP_LOG(( "id2entry", LDAP_LEVEL_ENTRY,
LDAP_LOG( INDEX, ENTRY,
"id2entry_rw: %s of %ld 0x%lx (disk)\n",
rw ? "write" : "read", id, (unsigned long)e ));
rw ? "write" : "read", id, (unsigned long)e );
#else
Debug( LDAP_DEBUG_TRACE, "<= id2entry_%s( %ld ) 0x%lx (disk)\n",
rw ? "w" : "r", id, (unsigned long) e );

47
servers/slapd/back-ldbm/idl.c
View file

@ -104,8 +104,7 @@ idl_free( ID_BLOCK *idl )
{
if ( idl == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_INFO,
"idl_free: called with NULL pointer\n" ));
LDAP_LOG( INDEX, INFO, "idl_free: called with NULL pointer\n" , 0,0,0);
#else
Debug( LDAP_DEBUG_TRACE,
"idl_free: called with NULL pointer\n",
@ -217,8 +216,8 @@ idl_fetch(
if ( (tmp[i] = idl_fetch_one( be, db, data )) == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_INFO,
"idl_fetch: idl_fetch_one returned NULL\n" ));
LDAP_LOG( INDEX, INFO,
"idl_fetch: idl_fetch_one returned NULL\n", 0,0,0 );
#else
Debug( LDAP_DEBUG_ANY,
"idl_fetch: one returned NULL\n", 0, 0, 0 );
@ -259,9 +258,9 @@ idl_fetch(
#endif
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_ENTRY,
LDAP_LOG( INDEX, ENTRY,
"idl_fetch: %ld ids (%ld max)\n",
ID_BLOCK_NIDS(idl), ID_BLOCK_NMAXN(idl) ));
ID_BLOCK_NIDS(idl), ID_BLOCK_NMAXN(idl), 0 );
#else
Debug( LDAP_DEBUG_TRACE, "<= idl_fetch %ld ids (%ld max)\n",
ID_BLOCK_NIDS(idl), ID_BLOCK_NMAXN(idl), 0 );
@ -408,8 +407,8 @@ idl_change_first(
/* delete old key block */
if ( (rc = ldbm_cache_delete( db, bkey )) != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_INFO,
"idl_change_first: ldbm_cache_delete returned %d\n", rc ));
LDAP_LOG( INDEX, INFO,
"idl_change_first: ldbm_cache_delete returned %d\n", rc, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"idl_change_first: ldbm_cache_delete returned %d\n",
@ -424,8 +423,8 @@ idl_change_first(
if ( (rc = idl_store( be, db, bkey, b )) != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_INFO,
"idl_change_first: idl_store returned %d\n", rc ));
LDAP_LOG( INDEX, INFO,
"idl_change_first: idl_store returned %d\n", rc, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"idl_change_first: idl_store returned %d\n", rc, 0, 0 );
@ -438,8 +437,8 @@ idl_change_first(
ID_BLOCK_ID(h, pos) = ID_BLOCK_ID(b, 0);
if ( (rc = idl_store( be, db, hkey, h )) != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_INFO,
"idl_change_first: idl_store returned %s\n", rc ));
LDAP_LOG( INDEX, INFO,
"idl_change_first: idl_store returned %s\n", rc, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"idl_change_first: idl_store returned %d\n", rc, 0, 0 );
@ -572,8 +571,8 @@ idl_insert_key(
if ( (tmp = idl_fetch_one( be, db, k2 )) == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_ERR,
"idl_insert_key: nonexistent continuation block\n" ));
LDAP_LOG( INDEX, ERR,
"idl_insert_key: nonexistent continuation block\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "idl_insert_key: nonexistent continuation block\n",
0, 0, 0 );
@ -589,8 +588,8 @@ idl_insert_key(
case 0: /* id inserted ok */
if ( (rc = idl_store( be, db, k2, tmp )) != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_ERR,
"ids_insert_key: idl_store returned %d\n", rc ));
LDAP_LOG( INDEX, ERR,
"ids_insert_key: idl_store returned %d\n", rc, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"idl_insert_key: idl_store returned %d\n", rc, 0, 0 );
@ -632,8 +631,8 @@ idl_insert_key(
cont_id( &k2, ID_BLOCK_ID(idl, i) );
if ( (tmp2 = idl_fetch_one( be, db, k2 )) == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_ERR,
"idl_insert_key: idl_fetch_one returned NULL\n"));
LDAP_LOG( INDEX, ERR,
"idl_insert_key: idl_fetch_one returned NULL\n", 0, 0, 0);
#else
Debug( LDAP_DEBUG_ANY,
"idl_insert_key: idl_fetch_one returned NULL\n",
@ -661,8 +660,8 @@ idl_insert_key(
if ( (rc = idl_store( be, db, k2, tmp )) != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_ERR,
"idl_insert_key: idl_store returned %d\n", rc ));
LDAP_LOG( INDEX, ERR,
"idl_insert_key: idl_store returned %d\n", rc, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"idl_insert_key: idl_store returned %d\n", rc, 0, 0 );
@ -692,9 +691,9 @@ idl_insert_key(
*/
if ( rc == 2 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_INFO,
LDAP_LOG( INDEX, INFO,
"idl_insert_key: id %ld is already in next block\n",
id ));
id, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"idl_insert_key: id %ld already in next block\n",
@ -947,8 +946,8 @@ idl_delete_key (
if ( (tmp = idl_fetch_one( be, db, data )) == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "idl", LDAP_LEVEL_INFO,
"idl_delete_key: idl_fetch_one returned NULL\n" ));
LDAP_LOG( INDEX, INFO,
"idl_delete_key: idl_fetch_one returned NULL\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"idl_delete_key: idl_fetch of returned NULL\n", 0, 0, 0 );

15
servers/slapd/back-ldbm/index.c
View file

@ -160,9 +160,8 @@ static int indexer(
if ( db == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "index", LDAP_LEVEL_ERR,
"index_read: Could not open db %s%s\n",
dbname, LDBM_SUFFIX ));
LDAP_LOG( INDEX, ERR,
"index_read: Could not open db %s%s\n", dbname, LDBM_SUFFIX, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"<= index_read NULL (could not open %s%s)\n",
@ -299,10 +298,9 @@ index_entry(
Attribute *ap )
{
#ifdef NEW_LOGGING
LDAP_LOG(( "index", LDAP_LEVEL_ENTRY,
"index_entry: %s (%s)%ld\n",
op == SLAP_INDEX_ADD_OP ? "add" : "del",
e->e_dn, e->e_id ));
LDAP_LOG( INDEX, ENTRY,
"index_entry: %s (%s)%ld\n", op == SLAP_INDEX_ADD_OP ? "add" : "del",
e->e_dn, e->e_id );
#else
Debug( LDAP_DEBUG_TRACE, "=> index_entry_%s( %ld, \"%s\" )\n",
op == SLAP_INDEX_ADD_OP ? "add" : "del",
@ -315,8 +313,7 @@ index_entry(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "index", LDAP_LEVEL_ENTRY,
"index_entry: success\n" ));
LDAP_LOG( INDEX, ENTRY, "index_entry: success\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "<= index_entry_%s( %ld, \"%s\" ) success\n",
op == SLAP_INDEX_ADD_OP ? "add" : "del",

4
servers/slapd/back-ldbm/init.c
View file

@ -202,8 +202,8 @@ ldbm_back_db_open(
if ( rc != 0 )
{
#ifdef NEW_LOGGING
LDAP_LOG (( "init", LDAP_LEVEL_ERR, "ldbm_back_db_open: sync "
"ldap_pvt_thread_create failed (%d)\n", rc ));
LDAP_LOG ( BACK_LDBM, ERR, "ldbm_back_db_open: sync "
"ldap_pvt_thread_create failed (%d)\n", rc, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"sync ldap_pvt_thread_create failed (%d)\n", rc, 0, 0 );

16
servers/slapd/back-ldbm/key.c
View file

@ -28,8 +28,7 @@ key_read(
ID_BLOCK *idl;
#ifdef NEW_LOGGING
LDAP_LOG(( "index", LDAP_LEVEL_ENTRY,
"key_read: enter\n" ));
LDAP_LOG( INDEX, ENTRY, "key_read: enter\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "=> key_read\n", 0, 0, 0 );
#endif
@ -42,9 +41,8 @@ key_read(
idl = idl_fetch( be, db, key );
#ifdef NEW_LOGGING
LDAP_LOG(( "index", LDAP_LEVEL_ENTRY,
"key_read: %ld candidates\n",
idl ? ID_BLOCK_NIDS(idl) : 0 ));
LDAP_LOG( INDEX, ENTRY,
"key_read: %ld candidates\n", idl ? ID_BLOCK_NIDS(idl) : 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "<= index_read %ld candidates\n",
idl ? ID_BLOCK_NIDS(idl) : 0, 0, 0 );
@ -69,9 +67,8 @@ key_change(
Datum key;
#ifdef NEW_LOGGING
LDAP_LOG(( "index", LDAP_LEVEL_ENTRY,
"key_change: %s ID %lx\n",
op == SLAP_INDEX_ADD_OP ? "Add" : "Delete", (long)id ));
LDAP_LOG( INDEX, ENTRY, "key_change: %s ID %lx\n",
op == SLAP_INDEX_ADD_OP ? "Add" : "Delete", (long)id, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "=> key_change(%s,%lx)\n",
op == SLAP_INDEX_ADD_OP ? "ADD":"DELETE", (long) id, 0 );
@ -95,8 +92,7 @@ key_change(
#ifdef NEW_LOGGING
LDAP_LOG(( "index", LDAP_LEVEL_ENTRY,
"key_change: return %d\n", rc ));
LDAP_LOG( INDEX, ENTRY, "key_change: return %d\n", rc, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "<= key_change %d\n", rc, 0, 0 );
#endif

64
servers/slapd/back-ldbm/modify.c
View file

@ -41,8 +41,7 @@ int ldbm_modify_internal(
Attribute *ap;
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
"ldbm_modify_internal: %s\n", dn ));
LDAP_LOG( BACK_LDBM, ENTRY, "ldbm_modify_internal: %s\n", dn, 0, 0 );
#else
Debug(LDAP_DEBUG_TRACE, "ldbm_modify_internal: %s\n", dn, 0, 0);
#endif
@ -61,8 +60,7 @@ int ldbm_modify_internal(
switch ( mod->sm_op ) {
case LDAP_MOD_ADD:
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"ldbm_modify_internal: add\n" ));
LDAP_LOG( BACK_LDBM, DETAIL1, "ldbm_modify_internal: add\n", 0, 0, 0);
#else
Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: add\n", 0, 0, 0);
#endif
@ -70,9 +68,8 @@ int ldbm_modify_internal(
rc = modify_add_values( e, mod, text, textbuf, textlen );
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_modify_internal: failed %d (%s)\n",
rc, *text ));
LDAP_LOG( BACK_LDBM, INFO,
"ldbm_modify_internal: failed %d (%s)\n", rc, *text, 0 );
#else
Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: %d %s\n",
rc, *text, 0);
@ -82,8 +79,7 @@ int ldbm_modify_internal(
case LDAP_MOD_DELETE:
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"ldbm_modify_internal: delete\n" ));
LDAP_LOG( BACK_LDBM, DETAIL1, "ldbm_modify_internal: delete\n", 0,0,0);
#else
Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: delete\n", 0, 0, 0);
#endif
@ -92,8 +88,8 @@ int ldbm_modify_internal(
assert( rc != LDAP_TYPE_OR_VALUE_EXISTS );
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_modify_internal: failed %d (%s)\n", rc, *text ));
LDAP_LOG( BACK_LDBM, INFO,
"ldbm_modify_internal: failed %d (%s)\n", rc, *text, 0 );
#else
Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: %d %s\n",
rc, *text, 0);
@ -103,8 +99,7 @@ int ldbm_modify_internal(
case LDAP_MOD_REPLACE:
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"ldbm_modify_internal: replace\n" ));
LDAP_LOG( BACK_LDBM, DETAIL1, "ldbm_modify_internal: replace\n",0,0,0);
#else
Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: replace\n", 0, 0, 0);
#endif
@ -112,8 +107,8 @@ int ldbm_modify_internal(
rc = modify_replace_values( e, mod, text, textbuf, textlen );
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_modify_internal: failed %d (%s)\n", rc, *text ));
LDAP_LOG( BACK_LDBM, INFO,
"ldbm_modify_internal: failed %d (%s)\n", rc, *text, 0 );
#else
Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: %d %s\n",
rc, *text, 0);
@ -123,8 +118,8 @@ int ldbm_modify_internal(
case SLAP_MOD_SOFTADD:
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"ldbm_modify_internal: softadd\n" ));
LDAP_LOG( BACK_LDBM, DETAIL1,
"ldbm_modify_internal: softadd\n", 0, 0, 0 );
#else
Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: softadd\n", 0, 0, 0);
#endif
@ -141,8 +136,8 @@ int ldbm_modify_internal(
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_modify_internal: failed %d (%s)\n", rc, *text ));
LDAP_LOG( BACK_LDBM, INFO,
"ldbm_modify_internal: failed %d (%s)\n", rc, *text, 0 );
#else
Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: %d %s\n",
rc, *text, 0);
@ -152,8 +147,8 @@ int ldbm_modify_internal(
default:
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
"ldbm_modify_internal: invalid op %d\n", mod->sm_op ));
LDAP_LOG( BACK_LDBM, ERR,
"ldbm_modify_internal: invalid op %d\n", mod->sm_op, 0, 0 );
#else
Debug(LDAP_DEBUG_ANY, "ldbm_modify_internal: invalid op %d\n",
mod->sm_op, 0, 0);
@ -162,8 +157,8 @@ int ldbm_modify_internal(
rc = LDAP_OTHER;
*text = "Invalid modify operation";
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_modify_internal: %d (%s)\n", rc, *text ));
LDAP_LOG( BACK_LDBM, INFO,
"ldbm_modify_internal: %d (%s)\n", rc, *text, 0 );
#else
Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: %d %s\n",
rc, *text, 0);
@ -194,9 +189,9 @@ int ldbm_modify_internal(
rc = entry_schema_check( be, e, save_attrs, text, textbuf, textlen );
if ( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
"ldbm_modify_internal: entry failed schema check: %s\n",
*text ));
LDAP_LOG( BACK_LDBM, ERR,
"ldbm_modify_internal: entry failed schema check: %s\n",
*text, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "entry failed schema check: %s\n",
*text, 0, 0 );
@ -220,8 +215,9 @@ int ldbm_modify_internal(
SLAP_INDEX_DELETE_OP );
if ( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
"ldbm_modify_internal: Attribute index delete failure\n" ));
LDAP_LOG( BACK_LDBM, ERR,
"ldbm_modify_internal: Attribute index delete failure\n",
0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"Attribute index delete failure",
@ -240,8 +236,9 @@ int ldbm_modify_internal(
SLAP_INDEX_ADD_OP );
if ( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
"ldbm_modify_internal: Attribute index add failure\n" ));
LDAP_LOG( BACK_LDBM, ERR,
"ldbm_modify_internal: Attribute index add failure\n",
0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"Attribute index add failure",
@ -287,8 +284,7 @@ ldbm_back_modify(
size_t textlen = sizeof textbuf;
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
"ldbm_back_modify: enter\n" ));
LDAP_LOG( BACK_LDBM, ENTRY, "ldbm_back_modify: enter\n", 0, 0, 0);
#else
Debug(LDAP_DEBUG_ARGS, "ldbm_back_modify:\n", 0, 0, 0);
#endif
@ -329,8 +325,8 @@ ldbm_back_modify(
conn, op, e );
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_modify: entry (%s) is referral\n", ndn->bv_val ));
LDAP_LOG( BACK_LDBM, INFO,
"ldbm_back_modify: entry (%s) is referral\n", ndn->bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0,
0, 0 );

159
servers/slapd/back-ldbm/modrdn.c
View file

@ -74,11 +74,10 @@ ldbm_back_modrdn(
int manageDSAit = get_manageDSAit( op );
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
LDAP_LOG( BACK_LDBM, ENTRY,
"ldbm_back_modrdn: dn: %s newSuperior=%s\n",
dn->bv_len ? dn->bv_val : "NULL",
( newSuperior && newSuperior->bv_len )
? newSuperior->bv_val : "NULL" ));
( newSuperior && newSuperior->bv_len ) ? newSuperior->bv_val : "NULL",0 );
#else
Debug( LDAP_DEBUG_TRACE,
"==>ldbm_back_modrdn: dn: %s newSuperior=%s\n",
@ -124,8 +123,8 @@ ldbm_back_modrdn(
conn, op, e );
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_modrdn: entry %s is a referral\n", e->e_dn ));
LDAP_LOG( BACK_LDBM, INFO,
"ldbm_back_modrdn: entry %s is a referral\n", e->e_dn, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "entry %s is referral\n", e->e_dn,
0, 0 );
@ -140,8 +139,8 @@ ldbm_back_modrdn(
if ( has_children( be, e ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_modrdn: entry %s has children\n", e->e_dn ));
LDAP_LOG( BACK_LDBM, INFO,
"ldbm_back_modrdn: entry %s has children\n", e->e_dn, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "entry %s has children\n", e->e_dn,
0, 0 );
@ -165,8 +164,9 @@ ldbm_back_modrdn(
if( (p = dn2entry_w( be, &p_ndn, NULL )) == NULL) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_modrdn: parent of %s does not exist\n", e->e_ndn ));
LDAP_LOG( BACK_LDBM, INFO,
"ldbm_back_modrdn: parent of %s does not exist\n",
e->e_ndn, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "parent does not exist\n",
0, 0, 0);
@ -183,8 +183,9 @@ ldbm_back_modrdn(
children, NULL, ACL_WRITE, NULL ) )
{
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_modrdn: no access to parent of (%s)\n", e->e_dn ));
LDAP_LOG( BACK_LDBM, INFO,
"ldbm_back_modrdn: no access to parent of (%s)\n",
e->e_dn, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "no access to parent\n", 0,
0, 0 );
@ -196,9 +197,9 @@ ldbm_back_modrdn(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"ldbm_back_modrdn: wr to children of entry %s OK\n",
p_ndn.bv_val ));
LDAP_LOG( BACK_LDBM, DETAIL1,
"ldbm_back_modrdn: wr to children of entry %s OK\n",
p_ndn.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"ldbm_back_modrdn: wr to children of entry %s OK\n",
@ -212,8 +213,8 @@ ldbm_back_modrdn(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"ldbm_back_modrdn: parent dn=%s\n", p_dn.bv_val ));
LDAP_LOG( BACK_LDBM, DETAIL1,
"ldbm_back_modrdn: parent dn=%s\n", p_dn.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldbm_back_modrdn: parent dn=%s\n",
p_dn.bv_val, 0, 0 );
@ -233,9 +234,8 @@ ldbm_back_modrdn(
/* check parent for "children" acl */
if ( ! rc ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
"ldbm_back_modrdn: no access "
"to parent \"\"\n" ));
LDAP_LOG( BACK_LDBM, ERR,
"ldbm_back_modrdn: no access to parent \"\"\n", 0,0,0 );
#else
Debug( LDAP_DEBUG_TRACE,
"<=- ldbm_back_modrdn: no "
@ -250,9 +250,9 @@ ldbm_back_modrdn(
} else {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
"ldbm_back_modrdn: (%s) has no "
"parent & not a root.\n", dn ));
LDAP_LOG( BACK_LDBM, ERR,
"ldbm_back_modrdn: (%s) has no parent & not a root.\n",
dn, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"<=- ldbm_back_modrdn: no parent & "
@ -267,8 +267,8 @@ ldbm_back_modrdn(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_modrdn: (%s) no parent, locked root.\n", e->e_dn ));
LDAP_LOG( BACK_LDBM, INFO,
"ldbm_back_modrdn: (%s) no parent, locked root.\n", e->e_dn, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"ldbm_back_modrdn: no parent, locked root\n",
@ -280,9 +280,9 @@ ldbm_back_modrdn(
if ( newSuperior != NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
LDAP_LOG( BACK_LDBM, DETAIL1,
"ldbm_back_modrdn: new parent \"%s\" requested\n",
newSuperior->bv_val ));
newSuperior->bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"ldbm_back_modrdn: new parent \"%s\" requested...\n",
@ -294,10 +294,9 @@ ldbm_back_modrdn(
/* newSuperior == oldParent? */
if ( dn_match( &p_ndn, np_ndn ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO, "ldbm_back_modrdn: "
LDAP_LOG( BACK_LDBM, INFO, "ldbm_back_modrdn: "
"new parent\"%s\" seems to be the same as the "
"old parent \"%s\"\n",
newSuperior->bv_val, p_dn.bv_val ));
"old parent \"%s\"\n", newSuperior->bv_val, p_dn.bv_val, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldbm_back_modrdn: "
"new parent\"%s\" seems to be the same as the "
@ -316,8 +315,9 @@ ldbm_back_modrdn(
if ( nnewSuperior->bv_len ) {
if( (np = dn2entry_w( be, np_ndn, NULL )) == NULL) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
"ldbm_back_modrdn: newSup(ndn=%s) not found.\n", np_ndn->bv_val ));
LDAP_LOG( BACK_LDBM, ERR,
"ldbm_back_modrdn: newSup(ndn=%s) not found.\n",
np_ndn->bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"ldbm_back_modrdn: newSup(ndn=%s) not here!\n",
@ -330,9 +330,9 @@ ldbm_back_modrdn(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
LDAP_LOG( BACK_LDBM, DETAIL1,
"ldbm_back_modrdn: wr to new parent OK np=%p, id=%ld\n",
np, np->e_id ));
np, np->e_id, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"ldbm_back_modrdn: wr to new parent OK np=%p, id=%ld\n",
@ -344,8 +344,8 @@ ldbm_back_modrdn(
ACL_WRITE, NULL ) )
{
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_modrdn: no wr to newSup children.\n" ));
LDAP_LOG( BACK_LDBM, INFO,
"ldbm_back_modrdn: no wr to newSup children.\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"ldbm_back_modrdn: no wr to newSup children\n",
@ -360,8 +360,8 @@ ldbm_back_modrdn(
if ( is_entry_alias( np ) ) {
/* parent is an alias, don't allow add */
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_modrdn: entry (%s) is an alias.\n", np->e_dn ));
LDAP_LOG( BACK_LDBM, INFO,
"ldbm_back_modrdn: entry (%s) is an alias.\n", np->e_dn,0,0);
#else
Debug( LDAP_DEBUG_TRACE, "entry is alias\n", 0, 0, 0 );
#endif
@ -376,9 +376,9 @@ ldbm_back_modrdn(
if ( is_entry_referral( np ) ) {
/* parent is a referral, don't allow add */
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
LDAP_LOG( BACK_LDBM, INFO,
"ldbm_back_modrdn: entry (%s) is a referral\n",
np->e_dn ));
np->e_dn, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "entry (%s) is referral\n",
np->e_dn, 0, 0 );
@ -408,9 +408,9 @@ ldbm_back_modrdn(
/* check parent for "children" acl */
if ( ! rc ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
LDAP_LOG( BACK_LDBM, ERR,
"ldbm_back_modrdn: no access "
"to new superior \"\"\n" ));
"to new superior \"\"\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"<=- ldbm_back_modrdn: no "
@ -425,9 +425,9 @@ ldbm_back_modrdn(
} else {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
"ldbm_back_modrdn: \"\" "
"not allowed as new superior\n" ));
LDAP_LOG( BACK_LDBM, ERR,
"ldbm_back_modrdn: \"\" not allowed as new superior\n",
0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"<=- ldbm_back_modrdn: \"\" "
@ -444,8 +444,8 @@ ldbm_back_modrdn(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"ldbm_back_modrdn: wr to new parent's children OK.\n" ));
LDAP_LOG( BACK_LDBM, DETAIL1,
"ldbm_back_modrdn: wr to new parent's children OK.\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"ldbm_back_modrdn: wr to new parent's children OK\n",
@ -460,8 +460,8 @@ ldbm_back_modrdn(
dnNormalize2( NULL, &new_dn, &new_ndn );
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"ldbm_back_modrdn: new ndn=%s\n", new_ndn.bv_val ));
LDAP_LOG( BACK_LDBM, DETAIL1, "ldbm_back_modrdn: new ndn=%s\n",
new_ndn.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldbm_back_modrdn: new ndn=%s\n",
new_ndn.bv_val, 0, 0 );
@ -481,8 +481,8 @@ ldbm_back_modrdn(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_modrdn: new ndn (%s) does not exist\n", new_ndn.bv_val ));
LDAP_LOG( BACK_LDBM, INFO, "ldbm_back_modrdn: new ndn (%s) does not exist\n",
new_ndn.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"ldbm_back_modrdn: new ndn=%s does not exist\n",
@ -497,8 +497,9 @@ ldbm_back_modrdn(
LDAP_DN_FORMAT_LDAP ) )
{
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_modrdn: can't figure out type(s)/value(s) of newrdn\n" ));
LDAP_LOG( BACK_LDBM, INFO,
"ldbm_back_modrdn: can't figure out type(s)/value(s) of newrdn\n",
0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"ldbm_back_modrdn: can't figure out type(s)/value(s) of newrdn\n",
@ -511,9 +512,9 @@ ldbm_back_modrdn(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"ldbm_back_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 ));
LDAP_LOG( BACK_LDBM, DETAIL1,
"ldbm_back_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 );
#else
Debug( LDAP_DEBUG_TRACE,
"ldbm_back_modrdn: new_rdn_type=\"%s\", new_rdn_val=\"%s\"\n",
@ -525,8 +526,9 @@ ldbm_back_modrdn(
LDAP_DN_FORMAT_LDAP ) )
{
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_modrdn: can't figure out the old_rdn type(s)/value(s).\n" ));
LDAP_LOG( BACK_LDBM, INFO,
"ldbm_back_modrdn: can't figure out the old_rdn "
"type(s)/value(s).\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"ldbm_back_modrdn: can't figure out the old_rdn type(s)/value(s)\n",
@ -544,9 +546,9 @@ ldbm_back_modrdn(
{
/* Not a big deal but we may say something */
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
LDAP_LOG( BACK_LDBM, INFO,
"ldbm_back_modrdn: old_rdn_type=%s new_rdn_type=%s\n",
old_rdn_types[0], new_rdn_types[0] ));
old_rdn_types[0], new_rdn_types[0], 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"ldbm_back_modrdn: old_rdn_type=%s, new_rdn_type=%s!\n",
@ -556,8 +558,7 @@ ldbm_back_modrdn(
#endif
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"ldbm_back_modrdn: DN_X500\n" ));
LDAP_LOG( BACK_LDBM, DETAIL1, "ldbm_back_modrdn: DN_X500\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldbm_back_modrdn: DN_X500\n",
0, 0, 0 );
@ -573,9 +574,9 @@ ldbm_back_modrdn(
if ( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_modrdn: slap_bv2ad error: %s (%s)\n",
text, new_rdn[0][a_cnt]->la_attr.bv_val ));
LDAP_LOG( BACK_LDBM, INFO,
"ldbm_back_modrdn: slap_bv2ad error: %s (%s)\n",
text, new_rdn[0][a_cnt]->la_attr.bv_val, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"ldbm_back_modrdn: %s: %s (new)\n",
@ -591,10 +592,9 @@ ldbm_back_modrdn(
if ( ! access_allowed( be, conn, op, e,
desc, &new_rdn[0][a_cnt]->la_value, ACL_WRITE, NULL ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_modrdn: access "
"not allowed to attr \"%s\"\n",
new_rdn[0][a_cnt]->la_attr.bv_val ));
LDAP_LOG( BACK_LDBM, INFO,
"ldbm_back_modrdn: access not allowed to attr \"%s\"\n",
new_rdn[0][a_cnt]->la_attr.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"ldbm_back_modrdn: access not allowed "
@ -624,8 +624,9 @@ ldbm_back_modrdn(
/* Get value of old rdn */
if ( old_rdn == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_modrdn: can't figure out old RDN value(s) from old RDN\n" ));
LDAP_LOG( BACK_LDBM, INFO,
"ldbm_back_modrdn: can't figure out old RDN value(s) "
"from old RDN\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"ldbm_back_modrdn: can't figure out oldRDN value(s) from old RDN\n",
@ -646,9 +647,9 @@ ldbm_back_modrdn(
if ( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_modrdn: %s: %s (old)\n",
text, old_rdn[0][d_cnt]->la_attr.bv_val ));
LDAP_LOG( BACK_LDBM, INFO,
"ldbm_back_modrdn: %s: %s (old)\n",
text, old_rdn[0][d_cnt]->la_attr.bv_val, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"ldbm_back_modrdn: %s: %s (old)\n",
@ -664,10 +665,9 @@ ldbm_back_modrdn(
if ( ! access_allowed( be, conn, op, e,
desc, &old_rdn[0][d_cnt]->la_value, ACL_WRITE, NULL ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_modrdn: access "
"not allowed to attr \"%s\"\n",
old_rdn[0][d_cnt]->la_attr.bv_val ));
LDAP_LOG( BACK_LDBM, INFO,
"ldbm_back_modrdn: access not allowed to attr \"%s\"\n",
old_rdn[0][d_cnt]->la_attr.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"ldbm_back_modrdn: access not allowed "
@ -693,8 +693,9 @@ ldbm_back_modrdn(
mod = mod_tmp;
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"ldbm_back_modrdn: removing old_rdn_val=%s\n", old_rdn[0][d_cnt]->la_value.bv_val ));
LDAP_LOG( BACK_LDBM, DETAIL1,
"ldbm_back_modrdn: removing old_rdn_val=%s\n",
old_rdn[0][d_cnt]->la_value.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"ldbm_back_modrdn: removing old_rdn_val=%s\n",

8
servers/slapd/back-ldbm/nextid.c
View file

@ -27,8 +27,8 @@ next_id_read( Backend *be, ID *idp )
if ( (db = ldbm_cache_open( be, "nextid", LDBM_SUFFIX, LDBM_WRCREAT ))
== NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_CRIT,
"next_id_read: could not open/create nextid%s\n", LDBM_SUFFIX ));
LDAP_LOG( BACK_LDBM, CRIT,
"next_id_read: could not open/create nextid%s\n", LDBM_SUFFIX, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "Could not open/create nextid" LDBM_SUFFIX "\n",
0, 0, 0 );
@ -66,8 +66,8 @@ next_id_write( Backend *be, ID id )
if ( (db = ldbm_cache_open( be, "nextid", LDBM_SUFFIX, LDBM_WRCREAT ))
== NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_CRIT,
"next_id_write: Could not open/create nextid%s\n", LDBM_SUFFIX ));
LDAP_LOG( BACK_LDBM, CRIT,
"next_id_write: Could not open/create nextid%s\n", LDBM_SUFFIX, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "Could not open/create nextid" LDBM_SUFFIX "\n",
0, 0, 0 );

9
servers/slapd/back-ldbm/passwd.c
View file

@ -48,9 +48,8 @@ ldbm_back_exop_passwd(
&id, NULL, &new, text );
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
"ldbm_back_exop_passwd: \"%s\"\n",
id.bv_val ? id.bv_val : "" ));
LDAP_LOG( BACK_LDBM, ENTRY,
"ldbm_back_exop_passwd: \"%s\"\n", id.bv_val ? id.bv_val : "", 0,0 );
#else
Debug( LDAP_DEBUG_ARGS, "==> ldbm_back_exop_passwd: \"%s\"\n",
id.bv_val ? id.bv_val : "", 0, 0 );
@ -88,9 +87,9 @@ ldbm_back_exop_passwd(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
LDAP_LOG( BACK_LDBM, DETAIL1,
"ldbm_back_exop_passwd: \"%s\"%s\n",
dn.bv_val, id.bv_len ? " (proxy)" : "" ));
dn.bv_val, id.bv_len ? " (proxy)" : "", 0 );
#else
Debug( LDAP_DEBUG_TRACE, "passwd: \"%s\"%s\n",
dn.bv_val, id.bv_len ? " (proxy)" : "", 0 );

8
servers/slapd/back-ldbm/referral.c
View file

@ -51,9 +51,9 @@ ldbm_back_referrals(
matched_dn = ch_strdup( matched->e_dn );
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
LDAP_LOG( BACK_LDBM, DETAIL1,
"ldbm_back_referrals: op=%ld target=\"%s\" matched=\"%s\"\n",
op->o_tag, dn->bv_val, matched_dn ));
op->o_tag, dn->bv_val, matched_dn );
#else
Debug( LDAP_DEBUG_TRACE,
"ldbm_referrals: op=%ld target=\"%s\" matched=\"%s\"\n",
@ -98,9 +98,9 @@ ldbm_back_referrals(
refs, &e->e_name, dn, LDAP_SCOPE_DEFAULT );
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
LDAP_LOG( BACK_LDBM, DETAIL1,
"ldbm_referrals: op=%ld target=\"%s\" matched=\"%s\"\n",
op->o_tag, dn->bv_val, e->e_dn ));
op->o_tag, dn->bv_val, e->e_dn );
#else
Debug( LDAP_DEBUG_TRACE,
"ldbm_referrals: op=%ld target=\"%s\" matched=\"%s\"\n",

Some files were not shown because too many files have changed in this diff Show more