/* dn2id.c - routines to deal with the dn2id index */
/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
int
dn2id_add(
Backend *be,
- const char *dn,
+ struct berval *dn,
ID id
)
{
int rc, flags;
DBCache *db;
Datum key, data;
+ char *buf, *ptr, *pdn;
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
- "dn2id_add: (%s):%ld\n", dn, id ));
+ "dn2id_add: (%s):%ld\n", dn->bv_val, id ));
#else
- Debug( LDAP_DEBUG_TRACE, "=> dn2id_add( \"%s\", %ld )\n", dn, id, 0 );
+ Debug( LDAP_DEBUG_TRACE, "=> dn2id_add( \"%s\", %ld )\n", dn->bv_val, id, 0 );
#endif
assert( id != NOID );
}
ldbm_datum_init( key );
- key.dsize = strlen( dn ) + 2;
- key.dptr = ch_malloc( key.dsize );
- sprintf( key.dptr, "%c%s", DN_BASE_PREFIX, dn );
+ key.dsize = dn->bv_len + 2;
+ buf = ch_malloc( key.dsize );
+ key.dptr = buf;
+ buf[0] = DN_BASE_PREFIX;
+ ptr = buf + 1;
+ strcpy( ptr, dn->bv_val );
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( be, 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 );
ldap_pvt_thread_mutex_unlock( &db->dbc_write_mutex );
- free( key.dptr );
}
}
- if ( rc != -1 ) {
- char **subtree = dn_subtree( be, 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] );
- 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 );
- }
+ while ( rc != -1 && pdn != NULL ) {
+ if ( be_issuffix( be, pdn ))
+ break;
+
+ pdn[-1] = 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 != 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
int
dn2id(
Backend *be,
- const char *dn,
+ struct berval *dn,
ID *idp
)
{
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
- "dn2id: (%s)\n", dn ));
+ "dn2id: (%s)\n", dn->bv_val ));
#else
- Debug( LDAP_DEBUG_TRACE, "=> dn2id( \"%s\" )\n", dn, 0, 0 );
+ Debug( LDAP_DEBUG_TRACE, "=> dn2id( \"%s\" )\n", dn->bv_val, 0, 0 );
#endif
assert( idp );
ldbm_datum_init( key );
- key.dsize = strlen( dn ) + 2;
+ key.dsize = dn->bv_len + 2;
key.dptr = ch_malloc( key.dsize );
- sprintf( key.dptr, "%c%s", DN_BASE_PREFIX, dn );
+ sprintf( key.dptr, "%c%s", DN_BASE_PREFIX, dn->bv_val );
data = ldbm_cache_fetch( db, key );
int
dn2idl(
Backend *be,
- const char *dn,
+ struct berval *dn,
int prefix,
ID_BLOCK **idlp
)
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
- "dn2idl: \"%c%s\"\n", prefix, dn ));
+ "dn2idl: \"%c%s\"\n", prefix, dn->bv_val ));
#else
- Debug( LDAP_DEBUG_TRACE, "=> dn2idl( \"%c%s\" )\n", prefix, dn, 0 );
+ Debug( LDAP_DEBUG_TRACE, "=> dn2idl( \"%c%s\" )\n", prefix, dn->bv_val, 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;
+ if ( prefix == DN_SUBTREE_PREFIX && be_issuffix(be, dn->bv_val) ) {
+ *idlp = idl_allids( be );
return 0;
}
ldbm_datum_init( key );
- key.dsize = strlen( dn ) + 2;
+ key.dsize = dn->bv_len + 2;
key.dptr = ch_malloc( key.dsize );
- sprintf( key.dptr, "%c%s", prefix, dn );
+ sprintf( key.dptr, "%c%s", prefix, dn->bv_val );
*idlp = idl_fetch( be, db, key );
int
dn2id_delete(
Backend *be,
- const char *dn,
+ struct berval *dn,
ID id
)
{
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 ));
+ "dn2id_delete: (%s)%ld\n", dn->bv_val, id ));
#else
- Debug( LDAP_DEBUG_TRACE, "=> dn2id_delete( \"%s\", %ld )\n", dn, id, 0 );
+ Debug( LDAP_DEBUG_TRACE, "=> dn2id_delete( \"%s\", %ld )\n", dn->bv_val, id, 0 );
#endif
return( -1 );
}
+ ldbm_datum_init( key );
+ key.dsize = dn->bv_len + 2;
+ buf = ch_malloc( key.dsize );
+ key.dptr = buf;
+ buf[0] = DN_BASE_PREFIX;
+ ptr = buf + 1;
+ strcpy( ptr, dn->bv_val );
- {
- char *pdn = dn_parent( be, 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 );
- 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 ) {
+ pdn[-1] = DN_ONE_PREFIX;
+ key.dsize -= pdn - ptr;
+ key.dptr = pdn - 1;
- 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 );
}
- {
- char **subtree = dn_subtree( be, dn );
+ while ( 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;
- 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 );
+ 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 );
- free( key.dptr );
- }
-
- 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 );
Entry *
dn2entry_rw(
Backend *be,
- const char *dn,
+ struct berval *dn,
Entry **matched,
int rw
)
{
ID id;
Entry *e = NULL;
- char *pdn;
+ struct berval pdn;
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
"dn2entry_rw: %s entry %s\n", rw ? "w" : "r",
- dn ));
+ dn->bv_val ));
#else
Debug(LDAP_DEBUG_TRACE, "dn2entry_%s: dn: \"%s\"\n",
- rw ? "w" : "r", dn, 0);
+ rw ? "w" : "r", dn->bv_val, 0);
#endif
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
"dn2entry_rw: no entry for valid id (%ld), dn (%s)\n",
- id, dn ));
+ id, dn->bv_val ));
#else
Debug(LDAP_DEBUG_ANY,
"dn2entry_%s: no entry for valid id (%ld), dn \"%s\"\n",
- rw ? "w" : "r", id, dn);
+ rw ? "w" : "r", id, dn->bv_val);
#endif
/* must have been deleted from underneath us */
/* entry does not exist - see how much of the dn does exist */
/* dn_parent checks returns NULL if dn is suffix */
- if ( (pdn = dn_parent( be, dn )) != NULL ) {
+ if ( (pdn.bv_val = dn_parent( be, dn->bv_val )) != NULL && *pdn.bv_val ) {
+ pdn.bv_len = dn->bv_len - (pdn.bv_val - dn->bv_val);
/* get entry with reader lock */
- if ( (e = dn2entry_r( be, pdn, matched )) != NULL ) {
+ if ( (e = dn2entry_r( be, &pdn, matched )) != NULL ) {
*matched = e;
}
}
projects / openldap / blobdiff