X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldbm%2Fid2children.c;h=69a5d7c58978bda4b3a2f67763c40546ac12a2e7;hb=ab620c46541dd9b8306008a170cc5a5be0f12eb2;hp=aa8a79cecdec28aed1dd913ef2d2b3541a1d1f84;hpb=7e5cea4a5eeb3eb44179234af86ffa2a696ceded;p=openldap

diff --git a/servers/slapd/back-ldbm/id2children.c b/servers/slapd/back-ldbm/id2children.c
index aa8a79cecd..69a5d7c589 100644
--- a/servers/slapd/back-ldbm/id2children.c
+++ b/servers/slapd/back-ldbm/id2children.c
@@ -20,7 +20,7 @@ id2children_add(
 	struct dbcache	*db;
 	Datum		key;
 	int		len, rc;
-	IDList		*idl;
+	ID_BLOCK		*idl;
 	char		buf[20];
 
 	ldbm_datum_init( key );
@@ -64,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
@@ -84,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 );
@@ -104,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 );
@@ -127,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 );
 }