Remove abandon cruft

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

diff --git a/servers/slapd/back-ldbm/dn2id.c b/servers/slapd/back-ldbm/dn2id.c
index ef0c8bd393d207f50fcc08032fa0f11541d0689c..14f108753bac2eef67deab89194d807c86b8ae9b 100644 (file)
--- a/servers/slapd/back-ldbm/dn2id.c
+++ b/servers/slapd/back-ldbm/dn2id.c
@@ -86,7 +86,6 @@ dn2id_add(
        }
 
        while ( rc != -1 && pdn != NULL ) {
-               /* FIXME: dn_parent returns NULL if dn is suffix of be */
                if ( be_issuffix( be, pdn ))
                        break;
 
@@ -209,7 +208,7 @@ dn2id(
 int
 dn2idl(
     Backend    *be,
-    const char *dn,
+    struct berval      *dn,
     int                prefix,
     ID_BLOCK    **idlp
 )
@@ -219,15 +218,15 @@ dn2idl(
 
 #ifdef NEW_LOGGING
        LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-                  "dn2idl: \"%c%s\"\n", prefix, dn ));
+                  "dn2idl: \"%c%s\"\n", prefix, dn->bv_val ));
 #else
-       Debug( LDAP_DEBUG_TRACE, "=> dn2idl( \"%c%s\" )\n", prefix, dn, 0 );
+       Debug( LDAP_DEBUG_TRACE, "=> dn2idl( \"%c%s\" )\n", prefix, dn->bv_val, 0 );
 #endif
 
        assert( idlp != NULL );
        *idlp = NULL;
 
-       if ( prefix == DN_SUBTREE_PREFIX && be_issuffix(be, dn) ) {
+       if ( prefix == DN_SUBTREE_PREFIX && be_issuffix(be, dn->bv_val) ) {
                *idlp = ch_malloc( sizeof(ID) );
                **idlp = ID_BLOCK_ALLIDS_VALUE;
                return 0;
@@ -248,9 +247,9 @@ dn2idl(
 
        ldbm_datum_init( key );
 
-       key.dsize = strlen( dn ) + 2;
+       key.dsize = dn->bv_len + 2;
        key.dptr = ch_malloc( key.dsize );
-       sprintf( key.dptr, "%c%s", prefix, dn );
+       sprintf( key.dptr, "%c%s", prefix, dn->bv_val );
 
        *idlp = idl_fetch( be, db, key );
 
@@ -328,7 +327,6 @@ dn2id_delete(
        }
 
        while ( pdn != NULL ) {
-               /* FIXME: dn_parent returns NULL if dn is suffix of be */
                if ( be_issuffix( be, pdn ))
                        break;