Import resetting of c_dn/c_cdn after anonymous bind.

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

diff --git a/servers/slapd/back-ldbm/id2children.c b/servers/slapd/back-ldbm/id2children.c
index cd0cc7a6dfe58d86adf4117c97189e8e5dd75a85..d8e1db98865458584c138f1feb5b2a0f94e739d9 100644 (file)
--- a/servers/slapd/back-ldbm/id2children.c
+++ b/servers/slapd/back-ldbm/id2children.c
@@ -23,11 +23,7 @@ id2children_add(
        IDList          *idl;
        char            buf[20];
 
-#ifdef HAVE_BERKELEY_DB2
-       Datum           data;
-       memset( &key, 0, sizeof( key ) );
-       memset( &data, 0, sizeof( data ) );
-#endif
+       ldbm_datum_init( key );
 
        Debug( LDAP_DEBUG_TRACE, "=> id2children_add( %lu, %lu )\n",
               p ? p->e_id : 0, e->e_id, 0 );
@@ -77,18 +73,18 @@ id2children_remove(
        if ( (db = ldbm_cache_open( be, "id2children", LDBM_SUFFIX,
            LDBM_WRCREAT )) == NULL ) {
                Debug( LDAP_DEBUG_ANY,
-                   "<= id2children_add -1 could not open \"id2children%s\"\n",
+                   "<= id2children_remove -1 could not open \"id2children%s\"\n",
                    LDBM_SUFFIX, 0, 0 );
                return( -1 );
        }
 
-       memset( &key, 0, sizeof(key) );
+       ldbm_datum_init( key );
        sprintf( buf, "%c%ld", EQ_PREFIX, p ? p->e_id : 0 );
        key.dptr = buf;
        key.dsize = strlen( buf ) + 1;
 
        if ( idl_delete_key( be, db, key, e->e_id ) != 0 ) {
-               Debug( LDAP_DEBUG_TRACE, "<= id2children_add -1 (idl_insert)\n",
+               Debug( LDAP_DEBUG_TRACE, "<= id2children_remove -1 (idl_delete)\n",
                    0, 0, 0 );
                ldbm_cache_close( be, db );
                return( -1 );
@@ -96,7 +92,7 @@ id2children_remove(
 
        ldbm_cache_close( be, db );
 
-       Debug( LDAP_DEBUG_TRACE, "<= id2children_add 0\n", 0, 0, 0 );
+       Debug( LDAP_DEBUG_TRACE, "<= id2children_remove 0\n", 0, 0, 0 );
        return( 0 );
 }
 
@@ -112,9 +108,7 @@ has_children(
        IDList          *idl;
        char            buf[20];
 
-#ifdef HAVE_BERKELEY_DB2
-       memset( &key, 0, sizeof( key ) );
-#endif
+       ldbm_datum_init( key );
 
        Debug( LDAP_DEBUG_TRACE, "=> has_children( %lu )\n", p->e_id , 0, 0 );