Import alias deref'ing changes from -devel.

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

diff --git a/servers/slapd/back-ldbm/id2children.c b/servers/slapd/back-ldbm/id2children.c
index 171e6c2618dd27b13adb3117297994de3c0dcb13..69a5d7c58978bda4b3a2f67763c40546ac12a2e7 100644 (file)
--- a/servers/slapd/back-ldbm/id2children.c
+++ b/servers/slapd/back-ldbm/id2children.c
@@ -20,15 +20,10 @@ id2children_add(
        struct dbcache  *db;
        Datum           key;
        int             len, rc;
-       IDList          *idl;
+       ID_BLOCK                *idl;
        char            buf[20];
 
-#ifdef HAVE_BERKELEY_DB2
-       Datum           data;
-
        ldbm_datum_init( key );
-       ldbm_datum_init( data );
-#endif
 
        Debug( LDAP_DEBUG_TRACE, "=> id2children_add( %lu, %lu )\n",
               p ? p->e_id : 0, e->e_id, 0 );
@@ -69,7 +64,7 @@ id2children_remove(
        struct dbcache  *db;
        Datum           key;
        int             len, rc;
-       IDList          *idl;
+       ID_BLOCK                *idl;
        char            buf[20];
 
        Debug( LDAP_DEBUG_TRACE, "=> id2children_remove( %lu, %lu )\n", p ? p->e_id
@@ -89,7 +84,7 @@ id2children_remove(
        key.dsize = strlen( buf ) + 1;
 
        if ( idl_delete_key( be, db, key, e->e_id ) != 0 ) {
-               Debug( LDAP_DEBUG_TRACE, "<= id2children_remove -1 (idl_insert)\n",
+               Debug( LDAP_DEBUG_TRACE, "<= id2children_remove -1 (idl_delete)\n",
                    0, 0, 0 );
                ldbm_cache_close( be, db );
                return( -1 );
@@ -109,8 +104,8 @@ has_children(
 {
        struct dbcache  *db;
        Datum           key;
-       int             rc;
-       IDList          *idl;
+       int             rc = 0;
+       ID_BLOCK                *idl;
        char            buf[20];
 
        ldbm_datum_init( key );
@@ -132,9 +127,13 @@ has_children(
        idl = idl_fetch( be, db, key );
 
        ldbm_cache_close( be, db );
-       rc = idl ? 1 : 0;
-       idl_free( idl );
 
-       Debug( LDAP_DEBUG_TRACE, "<= has_children %d\n", rc, 0, 0 );
+       if( idl != NULL ) {
+               idl_free( idl );
+               rc = 1;
+       }
+
+       Debug( LDAP_DEBUG_TRACE, "<= has_children( %lu ): %s\n",
+               p->e_id, rc ? "yes" : "no", 0 );
        return( rc );
 }