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 );
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 );
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 );
return( -1 );
}
+ dn = ch_strdup( dn );
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 );
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;
return( e );
}
+ if ( id != NOID ) {
+ Debug(LDAP_DEBUG_ANY,
+ "dn2entry_%s: no entry for valid id (%lu), dn \"%s\"\n",
+ rw ? "w" : "r", id, dn);
+ /* must have been deleted from underneath us */
+ /* treat as if NOID was found */
+ }
+
/* stop when we get to the suffix */
if ( be_issuffix( be, dn ) ) {
return( NULL );
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 );