Add OpenLDAP RCS id

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

diff --git a/servers/slapd/back-ldbm/dn2id.c b/servers/slapd/back-ldbm/dn2id.c
index 1353146f4a21055ca29a121cba681e761989b764..f9b6154368936dc2d5781e35533bb6a38fcde935 100644 (file)
--- a/servers/slapd/back-ldbm/dn2id.c
+++ b/servers/slapd/back-ldbm/dn2id.c
@@ -18,7 +18,7 @@
 int
 dn2id_add(
     Backend    *be,
-    char       *dn,
+    const char *dn,
     ID         id
 )
 {
@@ -27,10 +27,8 @@ dn2id_add(
        Datum           key, data;
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
 
-       ldbm_datum_init( key );
-       ldbm_datum_init( data );
-
        Debug( LDAP_DEBUG_TRACE, "=> dn2id_add( \"%s\", %ld )\n", dn, id, 0 );
+       assert( id != NOID );
 
        if ( (db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT ))
            == NULL ) {
@@ -39,15 +37,12 @@ dn2id_add(
                return( -1 );
        }
 
-#ifndef DN_INDICES
-       key.dptr = dn;
-       key.dsize = strlen( key.dptr ) + 1;
-#else
+       ldbm_datum_init( key );
        key.dsize = strlen( dn ) + 2;
        key.dptr = ch_malloc( key.dsize );
        sprintf( key.dptr, "%c%s", DN_BASE_PREFIX, dn );
-#endif
 
+       ldbm_datum_init( data );
        data.dptr = (char *) &id;
        data.dsize = sizeof(ID);
 
@@ -56,18 +51,19 @@ dn2id_add(
 
        rc = ldbm_cache_store( db, key, data, flags );
 
-#ifdef DN_INDICES
        free( key.dptr );
 
        if ( rc != -1 ) {
                char *pdn = dn_parent( NULL, dn );
 
                if( pdn != NULL ) {
+                       ldbm_datum_init( key );
                        key.dsize = strlen( pdn ) + 2;
                        key.dptr = ch_malloc( key.dsize );
                        sprintf( key.dptr, "%c%s", DN_ONE_PREFIX, pdn );
                        rc = idl_insert_key( be, db, key, id );
                        free( key.dptr );
+                       free( pdn );
                }
        }
 
@@ -77,6 +73,7 @@ dn2id_add(
                if( subtree != NULL ) {
                        int i;
                        for( i=0; subtree[i] != NULL; i++ ) {
+                               ldbm_datum_init( key );
                                key.dsize = strlen( subtree[i] ) + 2;
                                key.dptr = ch_malloc( key.dsize );
                                sprintf( key.dptr, "%c%s",
@@ -91,9 +88,7 @@ dn2id_add(
 
                        charray_free( subtree );
                }
-
        }
-#endif
 
        ldbm_cache_close( be, db );
 
@@ -104,7 +99,7 @@ dn2id_add(
 ID
 dn2id(
     Backend    *be,
-    char       *dn
+    const char *dn
 )
 {
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
@@ -112,9 +107,6 @@ dn2id(
        ID              id;
        Datum           key, data;
 
-       ldbm_datum_init( key );
-       ldbm_datum_init( data );
-
        Debug( LDAP_DEBUG_TRACE, "=> dn2id( \"%s\" )\n", dn, 0, 0 );
 
        /* first check the cache */
@@ -131,22 +123,17 @@ dn2id(
                return( NOID );
        }
 
-#ifndef DN_INDICES
-       key.dptr = dn;
-       key.dsize = strlen( key.dptr ) + 1;
-#else
+       ldbm_datum_init( key );
+
        key.dsize = strlen( dn ) + 2;
        key.dptr = ch_malloc( key.dsize );
        sprintf( key.dptr, "%c%s", DN_BASE_PREFIX, dn );
-#endif
 
        data = ldbm_cache_fetch( db, key );
 
        ldbm_cache_close( be, db );
 
-#ifdef DN_INDICES
        free( key.dptr );
-#endif
 
        if ( data.dptr == NULL ) {
                Debug( LDAP_DEBUG_TRACE, "<= dn2id NOID\n", 0, 0, 0 );
@@ -155,17 +142,18 @@ dn2id(
 
        (void) memcpy( (char *) &id, data.dptr, sizeof(ID) );
 
+       assert( id != NOID );
+
        ldbm_datum_free( db->dbc_db, data );
 
        Debug( LDAP_DEBUG_TRACE, "<= dn2id %ld\n", id, 0, 0 );
        return( id );
 }
 
-#ifdef DN_INDICES
 ID_BLOCK *
 dn2idl(
     Backend    *be,
-    char       *dn,
+    const char *dn,
        int             prefix
 )
 {
@@ -173,8 +161,6 @@ dn2idl(
        Datum           key;
        ID_BLOCK        *idl;
 
-       ldbm_datum_init( key );
-
        Debug( LDAP_DEBUG_TRACE, "=> dn2idl( \"%c%s\" )\n", prefix, dn, 0 );
 
        if ( (db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT ))
@@ -184,6 +170,8 @@ dn2idl(
                return NULL;
        }
 
+       ldbm_datum_init( key );
+
        key.dsize = strlen( dn ) + 2;
        key.dptr = ch_malloc( key.dsize );
        sprintf( key.dptr, "%c%s", prefix, dn );
@@ -196,21 +184,22 @@ dn2idl(
 
        return( idl );
 }
-#endif
+
 
 int
 dn2id_delete(
     Backend    *be,
-    char       *dn
+    const char *dn,
+       ID id
 )
 {
        DBCache *db;
        Datum           key;
        int             rc;
 
-       ldbm_datum_init( key );
+       Debug( LDAP_DEBUG_TRACE, "=> dn2id_delete( \"%s\", %ld )\n", dn, id, 0 );
 
-       Debug( LDAP_DEBUG_TRACE, "=> dn2id_delete( \"%s\" )\n", dn, 0, 0 );
+       assert( id != NOID );
 
        if ( (db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT ))
            == NULL ) {
@@ -220,20 +209,55 @@ dn2id_delete(
                return( -1 );
        }
 
-#ifndef DN_INDICES
-       key.dptr = dn;
-       key.dsize = strlen( key.dptr ) + 1;
-#else
+
+       {
+               char *pdn = dn_parent( NULL, dn );
+
+               if( pdn != NULL ) {
+                       ldbm_datum_init( key );
+                       key.dsize = strlen( pdn ) + 2;
+                       key.dptr = ch_malloc( key.dsize );
+                       sprintf( key.dptr, "%c%s", DN_ONE_PREFIX, pdn );
+
+                       (void) idl_delete_key( be, db, key, id );
+
+                       free( key.dptr );
+                       free( pdn );
+               }
+       }
+
+#if 1
+       {
+               char **subtree = dn_subtree( NULL, dn );
+
+               if( subtree != NULL ) {
+                       int i;
+                       for( i=0; subtree[i] != NULL; i++ ) {
+                               ldbm_datum_init( key );
+                               key.dsize = strlen( subtree[i] ) + 2;
+                               key.dptr = ch_malloc( key.dsize );
+                               sprintf( key.dptr, "%c%s",
+                                       DN_SUBTREE_PREFIX, subtree[i] );
+
+                               (void) idl_delete_key( be, db, key, id );
+
+                               free( key.dptr );
+                       }
+
+                       charray_free( subtree );
+               }
+       }
+#endif
+
+       ldbm_datum_init( key );
+
        key.dsize = strlen( dn ) + 2;
        key.dptr = ch_malloc( key.dsize );
        sprintf( key.dptr, "%c%s", DN_BASE_PREFIX, dn );
-#endif
 
        rc = ldbm_cache_delete( db, key );
 
-#ifdef DN_INDICES
        free( key.dptr );
-#endif
 
        ldbm_cache_close( be, db );
 
@@ -249,7 +273,7 @@ dn2id_delete(
 Entry *
 dn2entry_rw(
     Backend    *be,
-    char       *dn,
+    const char *dn,
     Entry      **matched,
     int         rw
 )