2001-10-04 05:11:52 +08:00
|
|
|
/* attr.c - backend routines for dealing with attributes */
|
|
|
|
/* $OpenLDAP$ */
|
2003-11-29 05:08:20 +08:00
|
|
|
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
|
|
|
*
|
2009-01-22 08:40:04 +08:00
|
|
|
* Copyright 2000-2009 The OpenLDAP Foundation.
|
2003-11-29 05:08:20 +08:00
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted only as authorized by the OpenLDAP
|
|
|
|
* Public License.
|
|
|
|
*
|
|
|
|
* A copy of this license is available in the file LICENSE in the
|
|
|
|
* top-level directory of the distribution or, alternatively, at
|
|
|
|
* <http://www.OpenLDAP.org/license.html>.
|
2001-10-04 05:11:52 +08:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include "portable.h"
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
|
|
|
#include <ac/socket.h>
|
|
|
|
#include <ac/string.h>
|
|
|
|
|
|
|
|
#include "slap.h"
|
|
|
|
#include "back-bdb.h"
|
2008-09-23 23:30:48 +08:00
|
|
|
#include "config.h"
|
2005-03-03 00:35:59 +08:00
|
|
|
#include "lutil.h"
|
2001-10-04 05:11:52 +08:00
|
|
|
|
2005-10-27 18:34:33 +08:00
|
|
|
/* Find the ad, return -1 if not found,
|
|
|
|
* set point for insertion if ins is non-NULL
|
|
|
|
*/
|
|
|
|
int
|
2008-10-18 07:35:44 +08:00
|
|
|
bdb_attr_slot( struct bdb_info *bdb, AttributeDescription *ad, int *ins )
|
2001-10-04 05:11:52 +08:00
|
|
|
{
|
2005-10-26 16:31:38 +08:00
|
|
|
unsigned base = 0, cursor = 0;
|
|
|
|
unsigned n = bdb->bi_nattrs;
|
2005-10-27 18:34:33 +08:00
|
|
|
int val = 0;
|
2005-10-26 16:31:38 +08:00
|
|
|
|
|
|
|
while ( 0 < n ) {
|
2008-10-18 07:35:44 +08:00
|
|
|
unsigned pivot = n >> 1;
|
2005-10-26 16:31:38 +08:00
|
|
|
cursor = base + pivot;
|
|
|
|
|
|
|
|
val = SLAP_PTRCMP( ad, bdb->bi_attrs[cursor]->ai_desc );
|
|
|
|
if ( val < 0 ) {
|
|
|
|
n = pivot;
|
|
|
|
} else if ( val > 0 ) {
|
|
|
|
base = cursor + 1;
|
|
|
|
n -= pivot + 1;
|
|
|
|
} else {
|
|
|
|
return cursor;
|
|
|
|
}
|
|
|
|
}
|
2005-10-27 18:34:33 +08:00
|
|
|
if ( ins ) {
|
|
|
|
if ( val > 0 )
|
|
|
|
++cursor;
|
|
|
|
*ins = cursor;
|
|
|
|
}
|
|
|
|
return -1;
|
2001-10-04 05:11:52 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2005-10-26 16:31:38 +08:00
|
|
|
ainfo_insert( struct bdb_info *bdb, AttrInfo *a )
|
2001-10-04 05:11:52 +08:00
|
|
|
{
|
2008-10-18 07:35:44 +08:00
|
|
|
int x;
|
2005-10-27 18:34:33 +08:00
|
|
|
int i = bdb_attr_slot( bdb, a->ai_desc, &x );
|
2005-10-26 16:31:38 +08:00
|
|
|
|
|
|
|
/* Is it a dup? */
|
2005-10-27 18:34:33 +08:00
|
|
|
if ( i >= 0 )
|
2005-10-26 16:31:38 +08:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
bdb->bi_attrs = ch_realloc( bdb->bi_attrs, ( bdb->bi_nattrs+1 ) *
|
|
|
|
sizeof( AttrInfo * ));
|
|
|
|
if ( x < bdb->bi_nattrs )
|
|
|
|
AC_MEMCPY( &bdb->bi_attrs[x+1], &bdb->bi_attrs[x],
|
|
|
|
( bdb->bi_nattrs - x ) * sizeof( AttrInfo *));
|
|
|
|
bdb->bi_attrs[x] = a;
|
|
|
|
bdb->bi_nattrs++;
|
|
|
|
return 0;
|
2001-10-04 05:11:52 +08:00
|
|
|
}
|
|
|
|
|
2005-04-22 03:04:31 +08:00
|
|
|
AttrInfo *
|
2001-10-04 05:11:52 +08:00
|
|
|
bdb_attr_mask(
|
2001-11-27 11:41:03 +08:00
|
|
|
struct bdb_info *bdb,
|
2005-04-22 03:04:31 +08:00
|
|
|
AttributeDescription *desc )
|
2001-10-04 05:11:52 +08:00
|
|
|
{
|
2005-10-27 18:34:33 +08:00
|
|
|
int i = bdb_attr_slot( bdb, desc, NULL );
|
|
|
|
return i < 0 ? NULL : bdb->bi_attrs[i];
|
2001-10-04 05:11:52 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
bdb_attr_index_config(
|
2001-11-27 11:41:03 +08:00
|
|
|
struct bdb_info *bdb,
|
|
|
|
const char *fname,
|
|
|
|
int lineno,
|
|
|
|
int argc,
|
2008-09-23 23:30:48 +08:00
|
|
|
char **argv,
|
|
|
|
struct config_reply_s *c_reply)
|
2001-10-04 05:11:52 +08:00
|
|
|
{
|
2006-03-31 19:15:26 +08:00
|
|
|
int rc = 0;
|
2001-10-04 05:11:52 +08:00
|
|
|
int i;
|
|
|
|
slap_mask_t mask;
|
|
|
|
char **attrs;
|
|
|
|
char **indexes = NULL;
|
|
|
|
|
2002-08-24 08:55:24 +08:00
|
|
|
attrs = ldap_str2charray( argv[0], "," );
|
2001-10-04 05:11:52 +08:00
|
|
|
|
|
|
|
if( attrs == NULL ) {
|
|
|
|
fprintf( stderr, "%s: line %d: "
|
|
|
|
"no attributes specified: %s\n",
|
|
|
|
fname, lineno, argv[0] );
|
|
|
|
return LDAP_PARAM_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( argc > 1 ) {
|
2002-08-24 08:55:24 +08:00
|
|
|
indexes = ldap_str2charray( argv[1], "," );
|
2001-10-04 05:11:52 +08:00
|
|
|
|
|
|
|
if( indexes == NULL ) {
|
|
|
|
fprintf( stderr, "%s: line %d: "
|
|
|
|
"no indexes specified: %s\n",
|
|
|
|
fname, lineno, argv[1] );
|
2006-03-31 19:15:26 +08:00
|
|
|
rc = LDAP_PARAM_ERROR;
|
|
|
|
goto done;
|
2001-10-04 05:11:52 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if( indexes == NULL ) {
|
|
|
|
mask = bdb->bi_defaultmask;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
mask = 0;
|
|
|
|
|
|
|
|
for ( i = 0; indexes[i] != NULL; i++ ) {
|
|
|
|
slap_mask_t index;
|
|
|
|
rc = slap_str2index( indexes[i], &index );
|
|
|
|
|
|
|
|
if( rc != LDAP_SUCCESS ) {
|
2008-09-23 23:30:48 +08:00
|
|
|
if ( c_reply )
|
|
|
|
{
|
|
|
|
snprintf(c_reply->msg, sizeof(c_reply->msg),
|
|
|
|
"index type \"%s\" undefined", indexes[i] );
|
|
|
|
|
|
|
|
fprintf( stderr, "%s: line %d: %s\n",
|
|
|
|
fname, lineno, c_reply->msg );
|
|
|
|
}
|
2006-03-31 19:15:26 +08:00
|
|
|
rc = LDAP_PARAM_ERROR;
|
|
|
|
goto done;
|
2001-10-04 05:11:52 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
mask |= index;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-11-27 11:41:03 +08:00
|
|
|
if( !mask ) {
|
2008-09-23 23:30:48 +08:00
|
|
|
if ( c_reply )
|
|
|
|
{
|
|
|
|
snprintf(c_reply->msg, sizeof(c_reply->msg),
|
|
|
|
"no indexes selected" );
|
|
|
|
fprintf( stderr, "%s: line %d: %s\n",
|
|
|
|
fname, lineno, c_reply->msg );
|
|
|
|
}
|
2006-03-31 19:15:26 +08:00
|
|
|
rc = LDAP_PARAM_ERROR;
|
|
|
|
goto done;
|
2001-10-04 05:11:52 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
for ( i = 0; attrs[i] != NULL; i++ ) {
|
|
|
|
AttrInfo *a;
|
|
|
|
AttributeDescription *ad;
|
|
|
|
const char *text;
|
2004-12-20 11:31:44 +08:00
|
|
|
#ifdef LDAP_COMP_MATCH
|
|
|
|
ComponentReference* cr = NULL;
|
|
|
|
AttrInfo *a_cr = NULL;
|
|
|
|
#endif
|
2001-10-04 05:11:52 +08:00
|
|
|
|
|
|
|
if( strcasecmp( attrs[i], "default" ) == 0 ) {
|
2004-12-20 11:31:44 +08:00
|
|
|
bdb->bi_defaultmask |= mask;
|
2001-10-04 05:11:52 +08:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2004-12-20 11:31:44 +08:00
|
|
|
#ifdef LDAP_COMP_MATCH
|
|
|
|
if ( is_component_reference( attrs[i] ) ) {
|
|
|
|
rc = extract_component_reference( attrs[i], &cr );
|
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
2008-09-23 23:30:48 +08:00
|
|
|
if ( c_reply )
|
|
|
|
{
|
|
|
|
snprintf(c_reply->msg, sizeof(c_reply->msg),
|
|
|
|
"index component reference\"%s\" undefined",
|
|
|
|
attrs[i] );
|
|
|
|
fprintf( stderr, "%s: line %d: %s\n",
|
|
|
|
fname, lineno, c_reply->msg );
|
|
|
|
}
|
2006-03-31 19:15:26 +08:00
|
|
|
goto done;
|
2004-12-20 11:31:44 +08:00
|
|
|
}
|
|
|
|
cr->cr_indexmask = mask;
|
|
|
|
/*
|
|
|
|
* After extracting a component reference
|
|
|
|
* only the name of a attribute will be remaining
|
|
|
|
*/
|
|
|
|
} else {
|
|
|
|
cr = NULL;
|
|
|
|
}
|
|
|
|
#endif
|
2001-10-04 05:11:52 +08:00
|
|
|
ad = NULL;
|
|
|
|
rc = slap_str2ad( attrs[i], &ad, &text );
|
|
|
|
|
|
|
|
if( rc != LDAP_SUCCESS ) {
|
2008-09-23 23:30:48 +08:00
|
|
|
if ( c_reply )
|
|
|
|
{
|
|
|
|
snprintf(c_reply->msg, sizeof(c_reply->msg),
|
|
|
|
"index attribute \"%s\" undefined",
|
|
|
|
attrs[i] );
|
|
|
|
|
|
|
|
fprintf( stderr, "%s: line %d: %s\n",
|
|
|
|
fname, lineno, c_reply->msg );
|
|
|
|
}
|
2006-03-31 19:15:26 +08:00
|
|
|
goto done;
|
2001-10-04 05:11:52 +08:00
|
|
|
}
|
|
|
|
|
2008-11-04 19:54:19 +08:00
|
|
|
if( ad == slap_schema.si_ad_entryDN || slap_ad_is_binary( ad ) ) {
|
2008-09-23 23:30:48 +08:00
|
|
|
if (c_reply) {
|
|
|
|
snprintf(c_reply->msg, sizeof(c_reply->msg),
|
|
|
|
"index of attribute \"%s\" disallowed", attrs[i] );
|
|
|
|
fprintf( stderr, "%s: line %d: %s\n",
|
|
|
|
fname, lineno, c_reply->msg );
|
|
|
|
}
|
2006-03-31 19:15:26 +08:00
|
|
|
rc = LDAP_UNWILLING_TO_PERFORM;
|
|
|
|
goto done;
|
2001-10-04 05:11:52 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if( IS_SLAP_INDEX( mask, SLAP_INDEX_APPROX ) && !(
|
2004-04-10 05:30:55 +08:00
|
|
|
ad->ad_type->sat_approx
|
2001-10-04 05:11:52 +08:00
|
|
|
&& ad->ad_type->sat_approx->smr_indexer
|
2004-04-10 05:30:55 +08:00
|
|
|
&& ad->ad_type->sat_approx->smr_filter ) )
|
2001-10-04 05:11:52 +08:00
|
|
|
{
|
2008-09-23 23:30:48 +08:00
|
|
|
if (c_reply) {
|
|
|
|
snprintf(c_reply->msg, sizeof(c_reply->msg),
|
|
|
|
"approx index of attribute \"%s\" disallowed", attrs[i] );
|
|
|
|
fprintf( stderr, "%s: line %d: %s\n",
|
|
|
|
fname, lineno, c_reply->msg );
|
|
|
|
}
|
2006-03-31 19:15:26 +08:00
|
|
|
rc = LDAP_INAPPROPRIATE_MATCHING;
|
|
|
|
goto done;
|
2001-10-04 05:11:52 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if( IS_SLAP_INDEX( mask, SLAP_INDEX_EQUALITY ) && !(
|
|
|
|
ad->ad_type->sat_equality
|
|
|
|
&& ad->ad_type->sat_equality->smr_indexer
|
|
|
|
&& ad->ad_type->sat_equality->smr_filter ) )
|
|
|
|
{
|
2008-09-23 23:30:48 +08:00
|
|
|
if (c_reply) {
|
|
|
|
snprintf(c_reply->msg, sizeof(c_reply->msg),
|
|
|
|
"equality index of attribute \"%s\" disallowed", attrs[i] );
|
|
|
|
fprintf( stderr, "%s: line %d: %s\n",
|
|
|
|
fname, lineno, c_reply->msg );
|
|
|
|
}
|
2006-03-31 19:15:26 +08:00
|
|
|
rc = LDAP_INAPPROPRIATE_MATCHING;
|
|
|
|
goto done;
|
2001-10-04 05:11:52 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if( IS_SLAP_INDEX( mask, SLAP_INDEX_SUBSTR ) && !(
|
|
|
|
ad->ad_type->sat_substr
|
|
|
|
&& ad->ad_type->sat_substr->smr_indexer
|
|
|
|
&& ad->ad_type->sat_substr->smr_filter ) )
|
|
|
|
{
|
2008-09-23 23:30:48 +08:00
|
|
|
if (c_reply) {
|
|
|
|
snprintf(c_reply->msg, sizeof(c_reply->msg),
|
|
|
|
"substr index of attribute \"%s\" disallowed", attrs[i] );
|
|
|
|
fprintf( stderr, "%s: line %d: %s\n",
|
|
|
|
fname, lineno, c_reply->msg );
|
|
|
|
}
|
2006-03-31 19:15:26 +08:00
|
|
|
rc = LDAP_INAPPROPRIATE_MATCHING;
|
|
|
|
goto done;
|
2001-10-04 05:11:52 +08:00
|
|
|
}
|
|
|
|
|
2002-04-03 02:56:26 +08:00
|
|
|
Debug( LDAP_DEBUG_CONFIG, "index %s 0x%04lx\n",
|
2001-10-22 21:23:05 +08:00
|
|
|
ad->ad_cname.bv_val, mask, 0 );
|
2001-10-04 05:11:52 +08:00
|
|
|
|
2006-03-31 19:15:26 +08:00
|
|
|
a = (AttrInfo *) ch_malloc( sizeof(AttrInfo) );
|
|
|
|
|
|
|
|
#ifdef LDAP_COMP_MATCH
|
|
|
|
a->ai_cr = NULL;
|
|
|
|
#endif
|
2001-10-04 05:11:52 +08:00
|
|
|
a->ai_desc = ad;
|
2005-04-22 03:04:31 +08:00
|
|
|
|
|
|
|
if ( bdb->bi_flags & BDB_IS_OPEN ) {
|
|
|
|
a->ai_indexmask = 0;
|
|
|
|
a->ai_newmask = mask;
|
|
|
|
} else {
|
|
|
|
a->ai_indexmask = mask;
|
|
|
|
a->ai_newmask = 0;
|
|
|
|
}
|
|
|
|
|
2004-12-20 11:31:44 +08:00
|
|
|
#ifdef LDAP_COMP_MATCH
|
|
|
|
if ( cr ) {
|
2005-10-26 16:31:38 +08:00
|
|
|
a_cr = bdb_attr_mask( bdb, ad );
|
2004-12-20 11:31:44 +08:00
|
|
|
if ( a_cr ) {
|
|
|
|
/*
|
|
|
|
* AttrInfo is already in AVL
|
|
|
|
* just add the extracted component reference
|
|
|
|
* in the AttrInfo
|
|
|
|
*/
|
|
|
|
rc = insert_component_reference( cr, &a_cr->ai_cr );
|
|
|
|
if ( rc != LDAP_SUCCESS) {
|
|
|
|
fprintf( stderr, " error during inserting component reference in %s ", attrs[i]);
|
2006-03-31 19:15:26 +08:00
|
|
|
rc = LDAP_PARAM_ERROR;
|
|
|
|
goto done;
|
2004-12-20 11:31:44 +08:00
|
|
|
}
|
|
|
|
continue;
|
|
|
|
} else {
|
|
|
|
rc = insert_component_reference( cr, &a->ai_cr );
|
|
|
|
if ( rc != LDAP_SUCCESS) {
|
|
|
|
fprintf( stderr, " error during inserting component reference in %s ", attrs[i]);
|
2006-03-31 19:15:26 +08:00
|
|
|
rc = LDAP_PARAM_ERROR;
|
|
|
|
goto done;
|
2004-12-20 11:31:44 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
2005-10-26 16:31:38 +08:00
|
|
|
rc = ainfo_insert( bdb, a );
|
2001-10-04 05:11:52 +08:00
|
|
|
if( rc ) {
|
2005-04-22 03:04:31 +08:00
|
|
|
if ( bdb->bi_flags & BDB_IS_OPEN ) {
|
2005-10-26 16:31:38 +08:00
|
|
|
AttrInfo *b = bdb_attr_mask( bdb, ad );
|
2005-04-22 03:04:31 +08:00
|
|
|
/* If we were editing this attr, reset it */
|
|
|
|
b->ai_indexmask &= ~BDB_INDEX_DELETING;
|
|
|
|
/* If this is leftover from a previous add, commit it */
|
|
|
|
if ( b->ai_newmask )
|
|
|
|
b->ai_indexmask = b->ai_newmask;
|
|
|
|
b->ai_newmask = a->ai_newmask;
|
|
|
|
ch_free( a );
|
2008-05-27 01:38:32 +08:00
|
|
|
rc = 0;
|
2005-04-22 03:04:31 +08:00
|
|
|
continue;
|
|
|
|
}
|
2008-09-23 23:30:48 +08:00
|
|
|
if (c_reply) {
|
|
|
|
snprintf(c_reply->msg, sizeof(c_reply->msg),
|
|
|
|
"duplicate index definition for attr \"%s\"",
|
|
|
|
attrs[i] );
|
|
|
|
fprintf( stderr, "%s: line %d: %s\n",
|
|
|
|
fname, lineno, c_reply->msg );
|
|
|
|
}
|
2001-10-04 05:11:52 +08:00
|
|
|
|
2006-03-31 19:15:26 +08:00
|
|
|
rc = LDAP_PARAM_ERROR;
|
|
|
|
goto done;
|
2001-10-04 05:11:52 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-03-31 19:15:26 +08:00
|
|
|
done:
|
2002-08-24 08:55:24 +08:00
|
|
|
ldap_charray_free( attrs );
|
|
|
|
if ( indexes != NULL ) ldap_charray_free( indexes );
|
2001-10-04 05:11:52 +08:00
|
|
|
|
2006-03-31 19:15:26 +08:00
|
|
|
return rc;
|
2001-10-04 05:11:52 +08:00
|
|
|
}
|
|
|
|
|
2005-07-04 13:21:39 +08:00
|
|
|
static int
|
2005-03-03 00:35:59 +08:00
|
|
|
bdb_attr_index_unparser( void *v1, void *v2 )
|
|
|
|
{
|
|
|
|
AttrInfo *ai = v1;
|
|
|
|
BerVarray *bva = v2;
|
|
|
|
struct berval bv;
|
|
|
|
char *ptr;
|
|
|
|
|
|
|
|
slap_index2bvlen( ai->ai_indexmask, &bv );
|
|
|
|
if ( bv.bv_len ) {
|
|
|
|
bv.bv_len += ai->ai_desc->ad_cname.bv_len + 1;
|
|
|
|
ptr = ch_malloc( bv.bv_len+1 );
|
|
|
|
bv.bv_val = lutil_strcopy( ptr, ai->ai_desc->ad_cname.bv_val );
|
|
|
|
*bv.bv_val++ = ' ';
|
|
|
|
slap_index2bv( ai->ai_indexmask, &bv );
|
|
|
|
bv.bv_val = ptr;
|
|
|
|
ber_bvarray_add( bva, &bv );
|
|
|
|
}
|
2005-07-04 13:21:39 +08:00
|
|
|
return 0;
|
2005-03-03 00:35:59 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static AttributeDescription addef = { NULL, NULL, BER_BVC("default") };
|
|
|
|
static AttrInfo aidef = { &addef };
|
|
|
|
|
|
|
|
void
|
|
|
|
bdb_attr_index_unparse( struct bdb_info *bdb, BerVarray *bva )
|
|
|
|
{
|
2005-10-26 16:31:38 +08:00
|
|
|
int i;
|
|
|
|
|
2005-03-03 00:35:59 +08:00
|
|
|
if ( bdb->bi_defaultmask ) {
|
|
|
|
aidef.ai_indexmask = bdb->bi_defaultmask;
|
|
|
|
bdb_attr_index_unparser( &aidef, bva );
|
|
|
|
}
|
2005-10-26 16:31:38 +08:00
|
|
|
for ( i=0; i<bdb->bi_nattrs; i++ )
|
|
|
|
bdb_attr_index_unparser( bdb->bi_attrs[i], bva );
|
2005-03-03 00:35:59 +08:00
|
|
|
}
|
|
|
|
|
2005-10-26 16:31:38 +08:00
|
|
|
void
|
|
|
|
bdb_attr_info_free( AttrInfo *ai )
|
2005-04-21 20:45:25 +08:00
|
|
|
{
|
|
|
|
#ifdef LDAP_COMP_MATCH
|
|
|
|
free( ai->ai_cr );
|
|
|
|
#endif
|
|
|
|
free( ai );
|
|
|
|
}
|
|
|
|
|
2001-10-04 05:11:52 +08:00
|
|
|
void
|
2005-10-26 16:31:38 +08:00
|
|
|
bdb_attr_index_destroy( struct bdb_info *bdb )
|
2001-10-04 05:11:52 +08:00
|
|
|
{
|
2005-10-26 16:31:38 +08:00
|
|
|
int i;
|
2001-10-04 05:11:52 +08:00
|
|
|
|
2005-10-26 16:31:38 +08:00
|
|
|
for ( i=0; i<bdb->bi_nattrs; i++ )
|
|
|
|
bdb_attr_info_free( bdb->bi_attrs[i] );
|
2005-04-21 20:45:25 +08:00
|
|
|
|
2005-10-26 16:31:38 +08:00
|
|
|
free( bdb->bi_attrs );
|
2005-04-21 20:45:25 +08:00
|
|
|
}
|
2005-04-22 03:04:31 +08:00
|
|
|
|
2005-10-26 16:31:38 +08:00
|
|
|
void bdb_attr_index_free( struct bdb_info *bdb, AttributeDescription *ad )
|
2005-04-22 03:04:31 +08:00
|
|
|
{
|
2005-10-27 18:34:33 +08:00
|
|
|
int i;
|
2005-10-26 16:31:38 +08:00
|
|
|
|
2005-10-27 18:34:33 +08:00
|
|
|
i = bdb_attr_slot( bdb, ad, NULL );
|
|
|
|
if ( i >= 0 ) {
|
2005-10-26 16:31:38 +08:00
|
|
|
bdb_attr_info_free( bdb->bi_attrs[i] );
|
|
|
|
bdb->bi_nattrs--;
|
|
|
|
for (; i<bdb->bi_nattrs; i++)
|
|
|
|
bdb->bi_attrs[i] = bdb->bi_attrs[i+1];
|
2005-04-22 03:04:31 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void bdb_attr_flush( struct bdb_info *bdb )
|
|
|
|
{
|
2005-10-26 16:31:38 +08:00
|
|
|
int i;
|
|
|
|
|
|
|
|
for ( i=0; i<bdb->bi_nattrs; i++ ) {
|
|
|
|
if ( bdb->bi_attrs[i]->ai_indexmask & BDB_INDEX_DELETING ) {
|
|
|
|
int j;
|
|
|
|
bdb_attr_info_free( bdb->bi_attrs[i] );
|
|
|
|
bdb->bi_nattrs--;
|
|
|
|
for (j=i; j<bdb->bi_nattrs; j++)
|
|
|
|
bdb->bi_attrs[j] = bdb->bi_attrs[j+1];
|
|
|
|
i--;
|
|
|
|
}
|
2005-04-22 03:04:31 +08:00
|
|
|
}
|
|
|
|
}
|