/* attr.c - backend routines for dealing with attributes */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2000-2004 The OpenLDAP Foundation.
+ * 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>.
*/
#include "portable.h"
#include "slap.h"
#include "back-bdb.h"
-#if BDB_CONFIG_INDICES
-
/* for the cache of attribute information (which are indexed, etc.) */
-typedef struct ldbm_attrinfo {
-#ifdef SLAPD_USE_AD
- AttributeDescription *ai_desc; /* attribute description cn;lang-en */
-#else
- char *ai_desc;
-#endif
+typedef struct bdb_attrinfo {
+ AttributeDescription *ai_desc; /* attribute description cn;lang-en */
slap_mask_t ai_indexmask; /* how the attr is indexed */
} AttrInfo;
static int
ainfo_type_cmp(
-#ifdef SLAPD_USE_AD
- AttributeDescription *desc,
-#else
- char *desc,
-#endif
- AttrInfo *a
+ const void *v_desc,
+ const void *v_a
)
{
-#ifdef SLAPD_USE_AD
- return ad_cmp( desc, a->ai_desc );
-#else
- return( strcasecmp( desc, a->ai_desc ) );
-#endif
+ const AttributeDescription *desc = v_desc;
+ const AttrInfo *a = v_a;
+ return SLAP_PTRCMP(desc, a->ai_desc);
}
static int
ainfo_cmp(
- AttrInfo *a,
- AttrInfo *b
+ const void *v_a,
+ const void *v_b
)
{
-#ifdef SLAPD_USE_AD
- return ad_cmp( a->ai_desc, b->ai_desc );
-#else
- return( strcasecmp( a->ai_desc, b->ai_desc ) );
-#endif
+ const AttrInfo *a = v_a, *b = v_b;
+ return SLAP_PTRCMP(a->ai_desc, b->ai_desc);
}
-#if 0
void
bdb_attr_mask(
- struct bdb_info *bdb,
-#ifdef SLAPD_USE_AD
+ struct bdb_info *bdb,
AttributeDescription *desc,
-#else
- const char *desc,
-#endif
- slap_mask_t *indexmask )
+ slap_mask_t *indexmask )
{
AttrInfo *a;
- a = (AttrInfo *) avl_find( bdb->bi_attrs, desc,
- (AVL_CMP) ainfo_type_cmp );
+ a = (AttrInfo *) avl_find( bdb->bi_attrs, desc, ainfo_type_cmp );
*indexmask = a != NULL ? a->ai_indexmask : 0;
}
-#endif
int
bdb_attr_index_config(
- struct bdb_info *bdb,
- const char *fname,
- int lineno,
- int argc,
- char **argv )
+ struct bdb_info *bdb,
+ const char *fname,
+ int lineno,
+ int argc,
+ char **argv )
{
int rc;
int i;
char **attrs;
char **indexes = NULL;
- attrs = str2charray( argv[0], "," );
+ attrs = ldap_str2charray( argv[0], "," );
if( attrs == NULL ) {
fprintf( stderr, "%s: line %d: "
}
if ( argc > 1 ) {
- indexes = str2charray( argv[1], "," );
+ indexes = ldap_str2charray( argv[1], "," );
if( indexes == NULL ) {
fprintf( stderr, "%s: line %d: "
}
}
- if( !mask ) {
+ if( !mask ) {
fprintf( stderr, "%s: line %d: "
"no indexes selected\n",
fname, lineno );
}
if( IS_SLAP_INDEX( mask, SLAP_INDEX_APPROX ) && !(
- ( ad->ad_type->sat_approx
+ ad->ad_type->sat_approx
&& ad->ad_type->sat_approx->smr_indexer
- && ad->ad_type->sat_approx->smr_filter )
- && ( ad->ad_type->sat_equality
- && ad->ad_type->sat_equality->smr_indexer
- && ad->ad_type->sat_equality->smr_filter ) ) )
+ && ad->ad_type->sat_approx->smr_filter ) )
{
fprintf( stderr, "%s: line %d: "
"approx index of attribute \"%s\" disallowed\n",
}
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
- "attr_index_config: index %s 0x%04x\n",
- ad->ad_cname->bv_val, mask ));
+ LDAP_LOG( BACK_BDB, DETAIL1,
+ "attr_index_config: index %s 0x%04lx\n",
+ ad->ad_cname.bv_val, mask, 0 );
#else
- Debug( LDAP_DEBUG_CONFIG, "index %s 0x%04x\n",
- ad->ad_cname->bv_val, mask, 0 );
+ Debug( LDAP_DEBUG_CONFIG, "index %s 0x%04lx\n",
+ ad->ad_cname.bv_val, mask, 0 );
#endif
-#ifdef SLAPD_USE_AD
a->ai_desc = ad;
-#else
- a->ai_desc = ch_strdup( ad->ad_cname->bv_val );
- ad_free( ad, 1 );
-#endif
-
a->ai_indexmask = mask;
rc = avl_insert( &bdb->bi_attrs, (caddr_t) a,
- (AVL_CMP) ainfo_cmp, (AVL_DUP) avl_dup_error );
+ ainfo_cmp, avl_dup_error );
if( rc ) {
fprintf( stderr, "%s: line %d: duplicate index definition "
"for attr \"%s\" (ignored)\n",
- fname, lineno, attrs[i] );
+ fname, lineno, attrs[i] );
return LDAP_PARAM_ERROR;
}
}
- charray_free( attrs );
- if ( indexes != NULL ) charray_free( indexes );
+ ldap_charray_free( attrs );
+ if ( indexes != NULL ) ldap_charray_free( indexes );
return LDAP_SUCCESS;
}
-
-static void
-ainfo_free( void *attr )
-{
- AttrInfo *ai = attr;
-#ifdef SLAPD_USE_AD
- ad_free( ai->ai_desc, 1 );
-#else
- free( ai->ai_desc );
-#endif
- free( ai );
-}
-
void
bdb_attr_index_destroy( Avlnode *tree )
{
- avl_free( tree, ainfo_free );
+ avl_free( tree, free );
}
-#endif
projects / openldap / blobdiff