When recreating a database from an ldif file created by ldbmcat,

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

diff --git a/servers/slapd/back-ldbm/dn2id.c b/servers/slapd/back-ldbm/dn2id.c
index ca8c209b6ff9f59f3ef1b9deddf584832214eea6..405ca65b692ccdc72967da6b4c6bd03fdd896e90 100644 (file)
--- a/servers/slapd/back-ldbm/dn2id.c
+++ b/servers/slapd/back-ldbm/dn2id.c
@@ -19,14 +19,12 @@ dn2id_add(
 )
 {
        int             rc, flags;
-       struct dbcache  *db;
+       DBCache *db;
        Datum           key, data;
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
 
-#ifdef HAVE_BERKELEY_DB2
-       memset( &key, 0, sizeof( key ) );
-       memset( &data, 0, sizeof( data ) );
-#endif
+       ldbm_datum_init( key );
+       ldbm_datum_init( data );
 
        Debug( LDAP_DEBUG_TRACE, "=> dn2id_add( \"%s\", %ld )\n", dn, id, 0 );
 
@@ -38,7 +36,7 @@ dn2id_add(
        }
 
        dn = ch_strdup( dn );
-       dn_normalize_case( dn );
+       (void) dn_normalize_case( dn );
 
        key.dptr = dn;
        key.dsize = strlen( dn ) + 1;
@@ -64,23 +62,21 @@ dn2id(
 )
 {
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
-       struct dbcache  *db;
+       DBCache *db;
        ID              id;
        Datum           key, data;
 
-#ifdef HAVE_BERKELEY_DB2
-       memset( &key, 0, sizeof( key ) );
-       memset( &data, 0, sizeof( data ) );
-#endif
+       ldbm_datum_init( key );
+       ldbm_datum_init( data );
 
        dn = ch_strdup( dn );
        Debug( LDAP_DEBUG_TRACE, "=> dn2id( \"%s\" )\n", dn, 0, 0 );
-       dn_normalize_case( dn );
+       (void) dn_normalize_case( dn );
 
        /* first check the cache */
        if ( (id = cache_find_entry_dn2id( be, &li->li_cache, dn )) != NOID ) {
                free( dn );
-               Debug( LDAP_DEBUG_TRACE, "<= dn2id %lu (in cache)\n", id,
+               Debug( LDAP_DEBUG_TRACE, "<= dn2id %ld (in cache)\n", id,
                        0, 0 );
                return( id );
        }
@@ -110,7 +106,7 @@ dn2id(
 
        ldbm_datum_free( db->dbc_db, data );
 
-       Debug( LDAP_DEBUG_TRACE, "<= dn2id %lu\n", id, 0, 0 );
+       Debug( LDAP_DEBUG_TRACE, "<= dn2id %ld\n", id, 0, 0 );
        return( id );
 }
 
@@ -120,14 +116,11 @@ dn2id_delete(
     char       *dn
 )
 {
-       struct ldbminfo *li = (struct ldbminfo *) be->be_private;
-       struct dbcache  *db;
+       DBCache *db;
        Datum           key;
        int             rc;
 
-#ifdef HAVE_BERKELEY_DB2
-       memset( &key, 0, sizeof( key ) );
-#endif
+       ldbm_datum_init( key );
 
        Debug( LDAP_DEBUG_TRACE, "=> dn2id_delete( \"%s\" )\n", dn, 0, 0 );
 
@@ -139,12 +132,15 @@ dn2id_delete(
                return( -1 );
        }
 
-       dn_normalize_case( dn );
+       dn = ch_strdup( dn );
+       (void) dn_normalize_case( dn );
        key.dptr = dn;
        key.dsize = strlen( dn ) + 1;
 
        rc = ldbm_cache_delete( db, key );
 
+       free( dn );
+
        ldbm_cache_close( be, db );
 
        Debug( LDAP_DEBUG_TRACE, "<= dn2id_delete %d\n", rc, 0, 0 );
@@ -156,11 +152,11 @@ dn2id_delete(
  * entry.
  */
 
-static Entry *
-dn2entry(
+Entry *
+dn2entry_rw(
     Backend    *be,
     char       *dn,
-    char       **matched,
+    Entry      **matched,
     int         rw
 )
 {
@@ -169,59 +165,41 @@ dn2entry(
        Entry           *e = NULL;
        char            *pdn;
 
-       Debug(LDAP_DEBUG_TRACE, "dn2entry_%s: dn: %s\n",
+       Debug(LDAP_DEBUG_TRACE, "dn2entry_%s: dn: \"%s\"\n",
                rw ? "w" : "r", dn, 0);
 
-       *matched = NULL;
+       if( matched != NULL ) {
+               /* caller cares about match */
+               *matched = NULL;
+       }
 
        if ( (id = dn2id( be, dn )) != NOID &&
-               (e = id2entry( be, id, rw )) != NULL )
+               (e = id2entry_rw( be, id, rw )) != NULL )
        {
                return( e );
        }
 
-       /* stop when we get to the suffix */
-       if ( be_issuffix( be, dn ) ) {
-               return( NULL );
+       if ( id != NOID ) {
+               Debug(LDAP_DEBUG_ANY,
+                       "dn2entry_%s: no entry for valid id (%ld), dn \"%s\"\n",
+                       rw ? "w" : "r", id, dn);
+               /* must have been deleted from underneath us */
+               /* treat as if NOID was found */
        }
 
+       /* caller doesn't care about match */
+       if( matched == NULL ) return NULL;
+
        /* 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 ) {
                /* get entry with reader lock */
                if ( (e = dn2entry_r( be, pdn, matched )) != NULL ) {
-                       if(*matched != NULL) {
-                               free(*matched);
-                       }
-                       *matched = pdn;
-                       /* free entry with reader lock */
-                       cache_return_entry_r( &li->li_cache, e );
-               } else {
-                       free( pdn );
+                       *matched = e;
                }
+               free( pdn );
        }
 
-       return( NULL );
+       return NULL;
 }
 
-Entry *
-dn2entry_r(
-       Backend *be,
-       char    *dn,
-       char    **matched
-)
-{
-       return( dn2entry( be, dn, matched, 0 ) );
-}
-
-Entry *
-dn2entry_w(
-       Backend *be,
-       char    *dn,
-       char    **matched
-)
-{
-       return( dn2entry( be, dn, matched, 1 ) );
-}
-
-
-