error message from be_entry_put tool backend function

[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..547cd63b6c590eb914e55ca7b5384f8f11bcb8fd 100644 (file)
--- a/servers/slapd/back-ldbm/dn2id.c
+++ b/servers/slapd/back-ldbm/dn2id.c
@@ -1,7 +1,7 @@
 /* dn2id.c - routines to deal with the dn2id index */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -19,7 +19,7 @@
 int
 dn2id_add(
     Backend    *be,
-    const char *dn,
+    struct berval *dn,
     ID         id
 )
 {
@@ -30,9 +30,9 @@ dn2id_add(
 
 #ifdef NEW_LOGGING
        LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-                  "dn2id_add: (%s):%ld\n", dn, id ));
+                  "dn2id_add: (%s):%ld\n", dn->bv_val, id ));
 #else
-       Debug( LDAP_DEBUG_TRACE, "=> dn2id_add( \"%s\", %ld )\n", dn, id, 0 );
+       Debug( LDAP_DEBUG_TRACE, "=> dn2id_add( \"%s\", %ld )\n", dn->bv_val, id, 0 );
 #endif
 
        assert( id != NOID );
@@ -51,12 +51,12 @@ dn2id_add(
        }
 
        ldbm_datum_init( key );
-       key.dsize = strlen( dn ) + 2;
+       key.dsize = dn->bv_len + 2;
        buf = ch_malloc( key.dsize );
        key.dptr = buf;
        buf[0] = DN_BASE_PREFIX;
        ptr = buf + 1;
-       strcpy( ptr, dn );
+       strcpy( ptr, dn->bv_val );
 
        ldbm_datum_init( data );
        data.dptr = (char *) &id;
@@ -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;
 
@@ -119,7 +118,7 @@ dn2id_add(
 int
 dn2id(
     Backend    *be,
-    const char *dn,
+    struct berval *dn,
     ID          *idp
 )
 {
@@ -129,9 +128,9 @@ dn2id(
 
 #ifdef NEW_LOGGING
        LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-                  "dn2id: (%s)\n", dn ));
+                  "dn2id: (%s)\n", dn->bv_val ));
 #else
-       Debug( LDAP_DEBUG_TRACE, "=> dn2id( \"%s\" )\n", dn, 0, 0 );
+       Debug( LDAP_DEBUG_TRACE, "=> dn2id( \"%s\" )\n", dn->bv_val, 0, 0 );
 #endif
 
        assert( idp );
@@ -168,9 +167,9 @@ dn2id(
 
        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", DN_BASE_PREFIX, dn );
+       sprintf( key.dptr, "%c%s", DN_BASE_PREFIX, dn->bv_val );
 
        data = ldbm_cache_fetch( db, key );
 
@@ -209,7 +208,7 @@ dn2id(
 int
 dn2idl(
     Backend    *be,
-    const char *dn,
+    struct berval      *dn,
     int                prefix,
     ID_BLOCK    **idlp
 )
@@ -219,17 +218,18 @@ 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) ) {
-               *idlp = ch_malloc( sizeof(ID) );
-               **idlp = ID_BLOCK_ALLIDS_VALUE;
+       if ( prefix == DN_SUBTREE_PREFIX && be_issuffix(be, dn->bv_val) ) {
+               *idlp = ch_malloc( 2*sizeof(ID) );
+               (*idlp)[0] = ID_BLOCK_ALLIDS_VALUE;
+               (*idlp)[1] = 0;
                return 0;
        }
 
@@ -248,9 +248,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 );
 
@@ -265,7 +265,7 @@ dn2idl(
 int
 dn2id_delete(
     Backend    *be,
-    const char *dn,
+    struct berval *dn,
        ID id
 )
 {
@@ -276,9 +276,9 @@ dn2id_delete(
 
 #ifdef NEW_LOGGING
        LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-                  "dn2id_delete: (%s)%ld\n", dn, id ));
+                  "dn2id_delete: (%s)%ld\n", dn->bv_val, id ));
 #else
-       Debug( LDAP_DEBUG_TRACE, "=> dn2id_delete( \"%s\", %ld )\n", dn, id, 0 );
+       Debug( LDAP_DEBUG_TRACE, "=> dn2id_delete( \"%s\", %ld )\n", dn->bv_val, id, 0 );
 #endif
 
 
@@ -299,12 +299,12 @@ dn2id_delete(
        }
 
        ldbm_datum_init( key );
-       key.dsize = strlen( dn ) + 2;
+       key.dsize = dn->bv_len + 2;
        buf = ch_malloc( key.dsize );
        key.dptr = buf;
        buf[0] = DN_BASE_PREFIX;
        ptr = buf + 1;
-       strcpy( ptr, dn );
+       strcpy( ptr, dn->bv_val );
 
        rc = ldbm_cache_delete( db, key );
        
@@ -328,7 +328,6 @@ dn2id_delete(
        }
 
        while ( pdn != NULL ) {
-               /* FIXME: dn_parent returns NULL if dn is suffix of be */
                if ( be_issuffix( be, pdn ))
                        break;
 
@@ -366,22 +365,22 @@ dn2id_delete(
 Entry *
 dn2entry_rw(
     Backend    *be,
-    const char *dn,
+    struct berval *dn,
     Entry      **matched,
     int                rw
 )
 {
        ID              id;
        Entry           *e = NULL;
-       char            *pdn;
+       struct berval   pdn;
 
 #ifdef NEW_LOGGING
        LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
                   "dn2entry_rw: %s entry %s\n", rw ? "w" : "r",
-                  dn ));
+                  dn->bv_val ));
 #else
        Debug(LDAP_DEBUG_TRACE, "dn2entry_%s: dn: \"%s\"\n",
-               rw ? "w" : "r", dn, 0);
+               rw ? "w" : "r", dn->bv_val, 0);
 #endif
 
 
@@ -403,11 +402,11 @@ dn2entry_rw(
 #ifdef NEW_LOGGING
                LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
                           "dn2entry_rw: no entry for valid id (%ld), dn (%s)\n",
-                          id, dn ));
+                          id, dn->bv_val ));
 #else
                Debug(LDAP_DEBUG_ANY,
                        "dn2entry_%s: no entry for valid id (%ld), dn \"%s\"\n",
-                       rw ? "w" : "r", id, dn);
+                       rw ? "w" : "r", id, dn->bv_val);
 #endif
 
                /* must have been deleted from underneath us */
@@ -419,9 +418,10 @@ dn2entry_rw(
 
        /* entry does not exist - see how much of the dn does exist */
        /* dn_parent checks returns NULL if dn is suffix */
-       if ( (pdn = dn_parent( be, dn )) != NULL ) {
+       if ( (pdn.bv_val = dn_parent( be, dn->bv_val )) != NULL && *pdn.bv_val ) {
+               pdn.bv_len = dn->bv_len - (pdn.bv_val - dn->bv_val);
                /* get entry with reader lock */
-               if ( (e = dn2entry_r( be, pdn, matched )) != NULL ) {
+               if ( (e = dn2entry_r( be, &pdn, matched )) != NULL ) {
                        *matched = e;
                }
        }