From e9a74cffbad6cd33a6e8ad1ec3919e96a9b52415 Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Fri, 27 Dec 2002 14:59:01 +0000 Subject: [PATCH] slapi used the old version of the LDAP_LOG macro (caught by Howard) --- servers/slapd/add.c | 12 ++++++++---- servers/slapd/backend.c | 12 ++++++++---- servers/slapd/bind.c | 12 ++++++++---- servers/slapd/compare.c | 12 ++++++++---- servers/slapd/delete.c | 12 ++++++++---- servers/slapd/modify.c | 12 ++++++++---- servers/slapd/modrdn.c | 12 ++++++++---- servers/slapd/search.c | 12 ++++++++---- 8 files changed, 64 insertions(+), 32 deletions(-) diff --git a/servers/slapd/add.c b/servers/slapd/add.c index 35a686f093..58a99bfa3a 100644 --- a/servers/slapd/add.c +++ b/servers/slapd/add.c @@ -243,9 +243,11 @@ do_add( Connection *conn, Operation *op ) * FIXME: is this correct? */ #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "do_add: add preOps failed\n")); + LDAP_LOG( OPERATION, INFO, "do_add: add preOps failed\n", + 0, 0, 0); #else - Debug (LDAP_DEBUG_TRACE, " add preOps failed.\n", 0, 0, 0); + Debug(LDAP_DEBUG_TRACE, "do_add: add preOps failed.\n", + 0, 0, 0); #endif } #endif /* defined( LDAP_SLAPI ) */ @@ -346,9 +348,11 @@ do_add( Connection *conn, Operation *op ) * FIXME: is this correct? */ #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "do_add: Add postOps failed\n")); + LDAP_LOG( OPERATION, INFO, "do_add: Add postOps failed\n", + 0, 0, 0); #else - Debug (LDAP_DEBUG_TRACE, " Add postOps failed.\n", 0, 0, 0); + Debug(LDAP_DEBUG_TRACE, "do_add: Add postOps failed.\n", + 0, 0, 0); #endif } #endif /* defined( LDAP_SLAPI ) */ diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c index fb1272b4b7..3048dd41bb 100644 --- a/servers/slapd/backend.c +++ b/servers/slapd/backend.c @@ -710,9 +710,11 @@ backend_unbind( * FIXME: is this correct? */ #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "do_bind: Unbind preOps failed\n")); + LDAP_LOG( OPERATION, INFO, "do_bind: Unbind preOps " + "failed\n", 0, 0, 0); #else - Debug (LDAP_DEBUG_TRACE, " Unbind preOps failed.\n", 0, 0, 0); + Debug(LDAP_DEBUG_TRACE, "do_bind: Unbind preOps " + "failed.\n", 0, 0, 0); #endif } #endif /* defined( LDAP_SLAPI ) */ @@ -732,9 +734,11 @@ backend_unbind( * FIXME: is this correct? */ #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "do_unbind: Unbind postOps failed\n")); + LDAP_LOG( OPERATION, INFO, "do_unbind: Unbind postOps " + "failed\n", 0, 0, 0); #else - Debug (LDAP_DEBUG_TRACE, " Unbind postOps failed.\n", 0, 0, 0); + Debug(LDAP_DEBUG_TRACE, "do_unbind: Unbind postOps " + "failed.\n", 0, 0, 0); #endif } #endif /* defined( LDAP_SLAPI ) */ diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c index f5062ba5cf..c33f82d78b 100644 --- a/servers/slapd/bind.c +++ b/servers/slapd/bind.c @@ -547,9 +547,11 @@ do_bind( * FIXME: is this correct? */ #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "do_bind: Bind preOps failed\n")); + LDAP_LOG( OPERATION, INFO, "do_bind: Bind preOps failed\n", + 0, 0, 0); #else - Debug(LDAP_DEBUG_TRACE, " Bind preOps failed.\n", 0, 0, 0); + Debug(LDAP_DEBUG_TRACE, "do_bind: Bind preOps failed.\n", + 0, 0, 0); #endif } #endif /* defined( LDAP_SLAPI ) */ @@ -630,9 +632,11 @@ do_bind( * FIXME: is this correct? */ #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "do_bind: Bind postOps failed\n")); + LDAP_LOG( OPERATION, INFO, "do_bind: Bind postOps failed\n", + 0, 0, 0); #else - Debug (LDAP_DEBUG_TRACE, " Bind postOps failed.\n", 0, 0, 0); + Debug(LDAP_DEBUG_TRACE, "do_bind: Bind postOps failed.\n", + 0, 0, 0); #endif } #endif /* defined( LDAP_SLAPI ) */ diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c index ab0546ffc9..82c99c2f9a 100644 --- a/servers/slapd/compare.c +++ b/servers/slapd/compare.c @@ -290,9 +290,11 @@ do_compare( * FIXME: is this correct? */ #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "do_compare: compare preOps failed\n")); + LDAP_LOG( OPERATION, INFO, "do_compare: compare preOps " + "failed\n", 0, 0, 0); #else - Debug (LDAP_DEBUG_TRACE, " compare preOps failed.\n", 0, 0, 0); + Debug(LDAP_DEBUG_TRACE, "do_compare: compare preOps " + "failed.\n", 0, 0, 0); #endif } #endif /* defined( LDAP_SLAPI ) */ @@ -315,9 +317,11 @@ do_compare( * FIXME: is this correct? */ #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "do_compare: compare postOps failed\n")); + LDAP_LOG( OPERATION, INFO, "do_compare: compare postOps " + "failed\n", 0, 0, 0 ); #else - Debug (LDAP_DEBUG_TRACE, " compare postOps failed.\n", 0, 0, 0); + Debug(LDAP_DEBUG_TRACE, "do_compare: compare postOps " + "failed.\n", 0, 0, 0); #endif } #endif /* defined( LDAP_SLAPI ) */ diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c index 849a494bc7..5584e61a5e 100644 --- a/servers/slapd/delete.c +++ b/servers/slapd/delete.c @@ -174,9 +174,11 @@ do_delete( * FIXME: is this correct? */ #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "do_delete: delete preOps failed\n")); + LDAP_LOG( OPERATION, INFO, "do_delete: delete preOps " + "failed\n", 0, 0, 0 ); #else - Debug (LDAP_DEBUG_TRACE, " delete preOps failed.\n", 0, 0, 0); + Debug (LDAP_DEBUG_TRACE, "do_delete: delete preOps failed.\n", + 0, 0, 0); #endif } #endif /* defined( LDAP_SLAPI ) */ @@ -231,9 +233,11 @@ do_delete( * FIXME: is this correct? */ #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "do_delete: delete postOps failed\n")); + LDAP_LOG( OPERATION, INFO, "do_delete: delete postOps " + "failed\n", 0, 0, 0 ); #else - Debug (LDAP_DEBUG_TRACE, " delete postOps failed.\n", 0, 0, 0); + Debug(LDAP_DEBUG_TRACE, "do_delete: delete postOps " + "failed.\n", 0, 0, 0); #endif } #endif /* defined( LDAP_SLAPI ) */ diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c index d024953c7c..f9f377b683 100644 --- a/servers/slapd/modify.c +++ b/servers/slapd/modify.c @@ -348,9 +348,11 @@ do_modify( * FIXME: is this correct? */ #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "do_modify: modify preOps failed\n")); + LDAP_LOG( OPERATION, INFO, "do_modify: modify preOps " + "failed\n", 0, 0, 0 ); #else - Debug (LDAP_DEBUG_TRACE, " modify preOps failed.\n", 0, 0, 0); + Debug(LDAP_DEBUG_TRACE, "do_modify: modify preOps failed.\n", + 0, 0, 0); #endif } #endif /* defined( LDAP_SLAPI ) */ @@ -442,9 +444,11 @@ do_modify( * FIXME: is this correct? */ #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "do_modify: modify postOps failed\n")); + LDAP_LOG( OPERATION, INFO, "do_modify: modify postOps " + "failed\n", 0, 0, 0 ); #else - Debug (LDAP_DEBUG_TRACE, " modify postOps failed.\n", 0, 0, 0); + Debug(LDAP_DEBUG_TRACE, "do_modify: modify postOps " + "failed.\n", 0, 0, 0); #endif } #endif /* defined( LDAP_SLAPI ) */ diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c index a4dc801038..5703f3ca06 100644 --- a/servers/slapd/modrdn.c +++ b/servers/slapd/modrdn.c @@ -349,9 +349,11 @@ do_modrdn( * FIXME: is this correct? */ #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "do_modrdn: modrdn preOps failed\n")); + LDAP_LOG( OPERATION, INFO, "do_modrdn: modrdn preOps " + "failed\n", 0, 0, 0 ); #else - Debug (LDAP_DEBUG_TRACE, " modrdn preOps failed.\n", 0, 0, 0); + Debug(LDAP_DEBUG_TRACE, "do_modrdn: modrdn preOps " + "failed.\n", 0, 0, 0); #endif } #endif /* defined( LDAP_SLAPI ) */ @@ -412,9 +414,11 @@ do_modrdn( * FIXME: is this correct? */ #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "do_modrdn: modrdn postOps failed\n")); + LDAP_LOG( OPERATION, INFO, "do_modrdn: modrdn postOps " + "failed\n", 0, 0, 0 ); #else - Debug (LDAP_DEBUG_TRACE, " modrdn postOps failed.\n", 0, 0, 0); + Debug(LDAP_DEBUG_TRACE, "do_modrdn: modrdn postOps " + "failed.\n", 0, 0, 0); #endif } #endif /* defined( LDAP_SLAPI ) */ diff --git a/servers/slapd/search.c b/servers/slapd/search.c index 9f26bcea35..b50ea8a5d4 100644 --- a/servers/slapd/search.c +++ b/servers/slapd/search.c @@ -363,9 +363,11 @@ do_search( * FIXME: is this correct? */ #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "do_search: search preOps failed\n")); + LDAP_LOG( OPERATION, INFO, "do_search: search preOps " + "failed\n", 0, 0, 0 ); #else - Debug(LDAP_DEBUG_TRACE, "search preOps failed.\n", 0, 0, 0); + Debug(LDAP_DEBUG_TRACE, "do_search: search preOps " + "failed.\n", 0, 0, 0); #endif } #endif /* defined( LDAP_SLAPI ) */ @@ -391,9 +393,11 @@ do_search( * FIXME: is this correct? */ #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "do_search: search postOps failed\n")); + LDAP_LOG( OPERATION, INFO, "do_search: search postOps " + "failed\n", 0, 0, 0 ); #else - Debug (LDAP_DEBUG_TRACE, " search postOps failed.\n", 0, 0, 0); + Debug(LDAP_DEBUG_TRACE, "do_search: search postOps " + "failed.\n", 0, 0, 0); #endif } #endif /* defined( LDAP_SLAPI ) */ -- 2.39.5