zap charray

[openldap] / servers / slapd / back-ldbm / attribute.c

diff --git a/servers/slapd/back-ldbm/attribute.c b/servers/slapd/back-ldbm/attribute.c
index eaa8d3e116e2cece0b479d0b0cb8c1f4605e0b89..0dc5daf03a20fb31a7e4f2f50743b0f0b0145520 100644 (file)
--- a/servers/slapd/back-ldbm/attribute.c
+++ b/servers/slapd/back-ldbm/attribute.c
@@ -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",