int rc, flags;
DBCache *db;
Datum key, data;
- struct ldbminfo *li = (struct ldbminfo *) be->be_private;
+ char *buf, *ptr, *pdn;
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
+ "dn2id_add: (%s):%ld\n", dn, id ));
+#else
Debug( LDAP_DEBUG_TRACE, "=> dn2id_add( \"%s\", %ld )\n", dn, id, 0 );
+#endif
+
assert( id != NOID );
if ( (db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT ))
== NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
+ "dn2id_add: couldn't open/create dn2id%s\n", LDBM_SUFFIX ));
+#else
Debug( LDAP_DEBUG_ANY, "Could not open/create dn2id%s\n",
LDBM_SUFFIX, 0, 0 );
+#endif
+
return( -1 );
}
ldbm_datum_init( key );
key.dsize = strlen( dn ) + 2;
- key.dptr = ch_malloc( key.dsize );
- sprintf( key.dptr, "%c%s", DN_BASE_PREFIX, dn );
+ buf = ch_malloc( key.dsize );
+ key.dptr = buf;
+ buf[0] = DN_BASE_PREFIX;
+ ptr = buf + 1;
+ strcpy( ptr, dn );
ldbm_datum_init( data );
data.dptr = (char *) &id;
flags = LDBM_INSERT;
rc = ldbm_cache_store( db, key, data, flags );
- free( key.dptr );
+ if ( rc != -1 && !be_issuffix( be, ptr )) {
+ buf[0] = DN_SUBTREE_PREFIX;
+ ldap_pvt_thread_mutex_lock( &db->dbc_write_mutex );
+ rc = idl_insert_key( be, db, key, id );
+ ldap_pvt_thread_mutex_unlock( &db->dbc_write_mutex );
+ }
if ( rc != -1 ) {
- char *pdn = dn_parent( NULL, dn );
+ pdn = dn_parent( be, ptr );
if( pdn != NULL ) {
- ldbm_datum_init( key );
- key.dsize = strlen( pdn ) + 2;
- key.dptr = ch_malloc( key.dsize );
- sprintf( key.dptr, "%c%s", DN_ONE_PREFIX, pdn );
+ pdn[-1] = DN_ONE_PREFIX;
+ key.dsize -= pdn - ptr;
+ key.dptr = pdn - 1;
+ ldap_pvt_thread_mutex_lock( &db->dbc_write_mutex );
rc = idl_insert_key( be, db, key, id );
- free( key.dptr );
- free( pdn );
+ ldap_pvt_thread_mutex_unlock( &db->dbc_write_mutex );
}
}
- if ( rc != -1 ) {
- char **subtree = dn_subtree( NULL, dn );
+ while ( rc != -1 && pdn != NULL ) {
+ if ( be_issuffix( be, pdn ))
+ break;
- if( subtree != NULL ) {
- int i;
- for( i=0; subtree[i] != NULL; i++ ) {
- ldbm_datum_init( key );
- key.dsize = strlen( subtree[i] ) + 2;
- key.dptr = ch_malloc( key.dsize );
- sprintf( key.dptr, "%c%s",
- DN_SUBTREE_PREFIX, subtree[i] );
+ pdn[-1] = DN_SUBTREE_PREFIX;
- rc = idl_insert_key( be, db, key, id );
+ ldap_pvt_thread_mutex_lock( &db->dbc_write_mutex );
+ rc = idl_insert_key( be, db, key, id );
+ ldap_pvt_thread_mutex_unlock( &db->dbc_write_mutex );
- free( key.dptr );
-
- if(rc == -1) break;
- }
-
- charray_free( subtree );
- }
+ if( rc != 0 ) break;
+ ptr = pdn;
+ pdn = dn_parent( be, pdn );
+ key.dsize -= pdn - ptr;
+ key.dptr = pdn - 1;
}
+ free( buf );
ldbm_cache_close( be, db );
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
+ "dn2id_add: return %d\n", rc ));
+#else
Debug( LDAP_DEBUG_TRACE, "<= dn2id_add %d\n", rc, 0, 0 );
+#endif
+
return( rc );
}
-ID
+int
dn2id(
Backend *be,
- const char *dn
+ const char *dn,
+ ID *idp
)
{
struct ldbminfo *li = (struct ldbminfo *) be->be_private;
DBCache *db;
- ID id;
Datum key, data;
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
+ "dn2id: (%s)\n", dn ));
+#else
Debug( LDAP_DEBUG_TRACE, "=> dn2id( \"%s\" )\n", dn, 0, 0 );
+#endif
+
+ assert( idp );
/* first check the cache */
- if ( (id = cache_find_entry_dn2id( be, &li->li_cache, dn )) != NOID ) {
- Debug( LDAP_DEBUG_TRACE, "<= dn2id %ld (in cache)\n", id,
+ if ( (*idp = cache_find_entry_ndn2id( be, &li->li_cache, dn )) != NOID ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
+ "dn2id: (%s)%ld in cache.\n", dn, *idp ));
+#else
+ Debug( LDAP_DEBUG_TRACE, "<= dn2id %ld (in cache)\n", *idp,
0, 0 );
- return( id );
+#endif
+
+ return( 0 );
}
if ( (db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT ))
== NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
+ "dn2id: couldn't open dn2id%s\n", LDBM_SUFFIX ));
+#else
Debug( LDAP_DEBUG_ANY, "<= dn2id could not open dn2id%s\n",
LDBM_SUFFIX, 0, 0 );
- return( NOID );
+#endif
+ /*
+ * return code !0 if ldbm cache open failed;
+ * callers should handle this
+ */
+ *idp = NOID;
+ return( -1 );
}
ldbm_datum_init( key );
free( key.dptr );
if ( data.dptr == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
+ "dn2id: (%s) NOID\n", dn ));
+#else
Debug( LDAP_DEBUG_TRACE, "<= dn2id NOID\n", 0, 0, 0 );
- return( NOID );
+#endif
+
+ *idp = NOID;
+ return( 0 );
}
- (void) memcpy( (char *) &id, data.dptr, sizeof(ID) );
+ AC_MEMCPY( (char *) idp, data.dptr, sizeof(ID) );
- assert( id != NOID );
+ assert( *idp != NOID );
ldbm_datum_free( db->dbc_db, data );
- Debug( LDAP_DEBUG_TRACE, "<= dn2id %ld\n", id, 0, 0 );
- return( id );
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
+ "dn2id: %ld\n", *idp ));
+#else
+ Debug( LDAP_DEBUG_TRACE, "<= dn2id %ld\n", *idp, 0, 0 );
+#endif
+
+ return( 0 );
}
-ID_BLOCK *
+int
dn2idl(
Backend *be,
const char *dn,
- int prefix
+ int prefix,
+ ID_BLOCK **idlp
)
{
DBCache *db;
Datum key;
- ID_BLOCK *idl;
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
+ "dn2idl: \"%c%s\"\n", prefix, dn ));
+#else
Debug( LDAP_DEBUG_TRACE, "=> dn2idl( \"%c%s\" )\n", prefix, dn, 0 );
+#endif
+
+ assert( idlp != NULL );
+ *idlp = NULL;
+
+ if ( prefix == DN_SUBTREE_PREFIX && be_issuffix(be, dn) ) {
+ *idlp = ch_malloc( sizeof(ID) );
+ **idlp = ID_BLOCK_ALLIDS_VALUE;
+ return 0;
+ }
if ( (db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT ))
== NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
+ "dn2idl: could not open dn2id%s\n", LDBM_SUFFIX ));
+#else
Debug( LDAP_DEBUG_ANY, "<= dn2idl could not open dn2id%s\n",
LDBM_SUFFIX, 0, 0 );
- return NULL;
+#endif
+
+ return -1;
}
ldbm_datum_init( key );
key.dptr = ch_malloc( key.dsize );
sprintf( key.dptr, "%c%s", prefix, dn );
- idl = idl_fetch( be, db, key );
+ *idlp = idl_fetch( be, db, key );
ldbm_cache_close( be, db );
free( key.dptr );
- return( idl );
+ return( 0 );
}
DBCache *db;
Datum key;
int rc;
+ char *buf, *ptr, *pdn;
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
+ "dn2id_delete: (%s)%ld\n", dn, id ));
+#else
Debug( LDAP_DEBUG_TRACE, "=> dn2id_delete( \"%s\", %ld )\n", dn, id, 0 );
+#endif
+
assert( id != NOID );
if ( (db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT ))
== NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
+ "dn2id_delete: couldn't open db2id%s\n", LDBM_SUFFIX ));
+#else
Debug( LDAP_DEBUG_ANY,
"<= dn2id_delete could not open dn2id%s\n", LDBM_SUFFIX,
0, 0 );
+#endif
+
return( -1 );
}
+ ldbm_datum_init( key );
+ key.dsize = strlen( dn ) + 2;
+ buf = ch_malloc( key.dsize );
+ key.dptr = buf;
+ buf[0] = DN_BASE_PREFIX;
+ ptr = buf + 1;
+ strcpy( ptr, dn );
- {
- char *pdn = dn_parent( NULL, dn );
+ rc = ldbm_cache_delete( db, key );
+
+ if( !be_issuffix( be, ptr )) {
+ buf[0] = DN_SUBTREE_PREFIX;
+ ldap_pvt_thread_mutex_lock( &db->dbc_write_mutex );
+ (void) idl_delete_key( be, db, key, id );
+ ldap_pvt_thread_mutex_unlock( &db->dbc_write_mutex );
+ }
- if( pdn != NULL ) {
- ldbm_datum_init( key );
- key.dsize = strlen( pdn ) + 2;
- key.dptr = ch_malloc( key.dsize );
- sprintf( key.dptr, "%c%s", DN_ONE_PREFIX, pdn );
+ pdn = dn_parent( be, ptr );
- (void) idl_delete_key( be, db, key, id );
+ if( pdn != NULL ) {
+ pdn[-1] = DN_ONE_PREFIX;
+ key.dsize -= pdn - ptr;
+ key.dptr = pdn - 1;
- free( key.dptr );
- free( pdn );
- }
+ ldap_pvt_thread_mutex_lock( &db->dbc_write_mutex );
+ (void) idl_delete_key( be, db, key, id );
+ ldap_pvt_thread_mutex_unlock( &db->dbc_write_mutex );
}
- {
- char **subtree = dn_subtree( NULL, dn );
-
- if( subtree != NULL ) {
- int i;
- for( i=0; subtree[i] != NULL; i++ ) {
- ldbm_datum_init( key );
- key.dsize = strlen( subtree[i] ) + 2;
- key.dptr = ch_malloc( key.dsize );
- sprintf( key.dptr, "%c%s",
- DN_SUBTREE_PREFIX, subtree[i] );
+ while ( pdn != NULL ) {
+ if ( be_issuffix( be, pdn ))
+ break;
- (void) idl_delete_key( be, db, key, id );
+ pdn[-1] = DN_SUBTREE_PREFIX;
- free( key.dptr );
- }
+ ldap_pvt_thread_mutex_lock( &db->dbc_write_mutex );
+ (void) idl_delete_key( be, db, key, id );
+ ldap_pvt_thread_mutex_unlock( &db->dbc_write_mutex );
- charray_free( subtree );
- }
+ ptr = pdn;
+ pdn = dn_parent( be, pdn );
+ key.dsize -= pdn - ptr;
+ key.dptr = pdn - 1;
}
- ldbm_datum_init( key );
-
- key.dsize = strlen( dn ) + 2;
- key.dptr = ch_malloc( key.dsize );
- sprintf( key.dptr, "%c%s", DN_BASE_PREFIX, dn );
-
- rc = ldbm_cache_delete( db, key );
-
- free( key.dptr );
+ free( buf );
ldbm_cache_close( be, db );
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
+ "dn2id_delete: return %d\n", rc ));
+#else
Debug( LDAP_DEBUG_TRACE, "<= dn2id_delete %d\n", rc, 0, 0 );
+#endif
+
return( rc );
}
Backend *be,
const char *dn,
Entry **matched,
- int rw
+ int rw
)
{
ID id;
Entry *e = NULL;
char *pdn;
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
+ "dn2entry_rw: %s entry %s\n", rw ? "w" : "r",
+ dn ));
+#else
Debug(LDAP_DEBUG_TRACE, "dn2entry_%s: dn: \"%s\"\n",
rw ? "w" : "r", dn, 0);
+#endif
+
if( matched != NULL ) {
/* caller cares about match */
*matched = NULL;
}
- if ( (id = dn2id( be, dn )) != NOID &&
- (e = id2entry_rw( be, id, rw )) != NULL )
- {
- return( e );
- }
+ if ( dn2id( be, dn, &id ) ) {
+ /* something bad happened to ldbm cache */
+ return( NULL );
- if ( id != NOID ) {
+ } else if ( id != NOID ) {
+ /* try to return the entry */
+ if ((e = id2entry_rw( be, id, rw )) != NULL ) {
+ return( e );
+ }
+
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
+ "dn2entry_rw: no entry for valid id (%ld), dn (%s)\n",
+ id, dn ));
+#else
Debug(LDAP_DEBUG_ANY,
"dn2entry_%s: no entry for valid id (%ld), dn \"%s\"\n",
rw ? "w" : "r", id, dn);
+#endif
+
/* must have been deleted from underneath us */
/* treat as if NOID was found */
}
if ( (e = dn2entry_r( be, pdn, matched )) != NULL ) {
*matched = e;
}
- free( pdn );
}
return NULL;