/* first check the cache */
if ( (id = cache_find_entry_dn2id( be, &li->li_cache, dn )) != NOID ) {
free( dn );
- Debug( LDAP_DEBUG_TRACE, "<= dn2id %lu (in cache)\n", id,
+ Debug( LDAP_DEBUG_TRACE, "<= dn2id %ld (in cache)\n", id,
0, 0 );
return( id );
}
ldbm_datum_free( db->dbc_db, data );
- Debug( LDAP_DEBUG_TRACE, "<= dn2id %lu\n", id, 0, 0 );
+ Debug( LDAP_DEBUG_TRACE, "<= dn2id %ld\n", id, 0, 0 );
return( id );
}
* entry.
*/
-static Entry *
-dn2entry(
+Entry *
+dn2entry_rw(
Backend *be,
char *dn,
char **matched,
*matched = NULL;
if ( (id = dn2id( be, dn )) != NOID &&
- (e = id2entry( be, id, rw )) != NULL )
+ (e = id2entry_rw( be, id, rw )) != NULL )
{
return( e );
}
+ if ( id != NOID ) {
+ Debug(LDAP_DEBUG_ANY,
+ "dn2entry_%s: no entry for valid id (%ld), 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 );
return( NULL );
}
-Entry *
-dn2entry_r(
- Backend *be,
- char *dn,
- char **matched
-)
-{
- return( dn2entry( be, dn, matched, 0 ) );
-}
-
-Entry *
-dn2entry_w(
- Backend *be,
- char *dn,
- char **matched
-)
-{
- return( dn2entry( be, dn, matched, 1 ) );
-}
-
-
-