Remove abandon cruft

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

diff --git a/servers/slapd/back-ldbm/attribute.c b/servers/slapd/back-ldbm/attribute.c
index 9dffdce630f3cc1fbfbde2e7e93a9480b69105ef..0e1e4303cd9d7a623cf9db9d2e30ca1f2e6dcb57 100644 (file)
--- a/servers/slapd/back-ldbm/attribute.c
+++ b/servers/slapd/back-ldbm/attribute.c
@@ -26,7 +26,7 @@ ldbm_back_attribute(
        Connection *conn,
        Operation *op,
        Entry   *target,
-       const char      *e_ndn,
+       struct berval   *entry_ndn,
        AttributeDescription *entry_at,
        struct berval ***vals )
 {
@@ -39,16 +39,16 @@ ldbm_back_attribute(
 
 #ifdef NEW_LOGGING
        LDAP_LOG(( "backend", LDAP_LEVEL_ARGS,
-                  "ldbm_back_attribute: gr dn: \"%s\"\n", e_ndn ));
+               "ldbm_back_attribute: gr dn: \"%s\"\n", entry_ndn ));
        LDAP_LOG(( "backend", LDAP_LEVEL_ARGS,
-                  "ldbm_back_attribute: at: \"%s\"\n", entry_at_name));
+               "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 : "" ));
+               "ldbm_back_attribute: tr dn: \"%s\"\n",
+               target ? target->e_ndn : "" ));
 #else
        Debug( LDAP_DEBUG_ARGS,
                "=> ldbm_back_attribute: gr dn: \"%s\"\n",
-               e_ndn, 0, 0 ); 
+               entry_ndn, 0, 0 ); 
        Debug( LDAP_DEBUG_ARGS,
                "=> ldbm_back_attribute: at: \"%s\"\n", 
                entry_at_name, 0, 0 ); 
@@ -58,31 +58,31 @@ ldbm_back_attribute(
                target ? target->e_ndn : "", 0, 0 ); 
 #endif
 
-       if (target != NULL && strcmp(target->e_ndn, e_ndn) == 0) {
+       if (target != NULL && strcmp(target->e_ndn, entry_ndn->bv_val) == 0) {
                /* 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",
-                          e_ndn ));
+                       "ldbm_back_attribute: target is LOCKED (%s)\n",
+                       entry_ndn->bv_val ));
 #else
                Debug( LDAP_DEBUG_ARGS,
                        "=> ldbm_back_attribute: target is entry: \"%s\"\n",
-                       e_ndn, 0, 0 );
+                       entry_ndn->bv_val, 0, 0 );
 #endif
 
 
        } else {
                /* can we find entry with reader lock */
-               if ((e = dn2entry_r(be, e_ndn, NULL )) == NULL) {
+               if ((e = dn2entry_r(be, entry_ndn->bv_val, NULL )) == NULL) {
 #ifdef NEW_LOGGING
                        LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
-                                  "ldbm_back_attribute: cannot find entry (%s)\n",
-                                  e_ndn ));
+                               "ldbm_back_attribute: cannot find entry (%s)\n",
+                               entry_ndn ));
 #else
                        Debug( LDAP_DEBUG_ACL,
                                "=> ldbm_back_attribute: cannot find entry: \"%s\"\n",
-                                       e_ndn, 0, 0 ); 
+                                       entry_ndn, 0, 0 ); 
 #endif
 
                        return LDAP_NO_SUCH_OBJECT; 
@@ -90,11 +90,12 @@ ldbm_back_attribute(
                
 #ifdef NEW_LOGGING
                LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-                          "ldbm_back_attribute: found entry (%s)\n", e_ndn ));
+                       "ldbm_back_attribute: found entry (%s)\n",
+                       entry_ndn->bv_val ));
 #else
                Debug( LDAP_DEBUG_ACL,
                        "=> ldbm_back_attribute: found entry: \"%s\"\n",
-                       e_ndn, 0, 0 ); 
+                       entry_ndn->bv_val, 0, 0 ); 
 #endif
 
     }
@@ -104,7 +105,7 @@ 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 ));
+                       "ldbm_back_attribute: entry (%s) is an alias\n", e->e_dn ));
 #else
                Debug( LDAP_DEBUG_ACL,
                        "<= ldbm_back_attribute: entry is an alias\n", 0, 0, 0 );
@@ -117,7 +118,7 @@ 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 ));
+                       "ldbm_back_attribute: entry (%s) is a referral.\n", e->e_dn ));
 #else
                Debug( LDAP_DEBUG_ACL,
                        "<= ldbm_back_attribute: entry is an referral\n", 0, 0, 0 );
@@ -138,7 +139,7 @@ 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 ));
+                       "ldbm_back_attribute: failed to find %s.\n", entry_at_name ));
 #else
                Debug( LDAP_DEBUG_ACL,
                        "<= ldbm_back_attribute: failed to find %s\n",