/* attr.c - backend routines for dealing with attributes */
/* $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
*/
#include "slap.h"
#include "back-ldbm.h"
-
/* 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
- slap_index ai_indexmask; /* how the attr is indexed */
+ 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
)
{
-#ifdef SLAPD_USE_AD
- return ad_cmp( desc, a->ai_desc );
-#else
- return( strcasecmp( desc, a->ai_desc ) );
-#endif
+ return desc - a->ai_desc;
}
static int
AttrInfo *b
)
{
-#ifdef SLAPD_USE_AD
- return ad_cmp( a->ai_desc, b->ai_desc );
-#else
- return( strcasecmp( a->ai_desc, b->ai_desc ) );
-#endif
+ return a->ai_desc - b->ai_desc;
}
void
attr_mask(
struct ldbminfo *li,
-#ifdef SLAPD_USE_AD
- AttributeDescription *desc,
-#else
- const char *desc,
-#endif
- slap_index *indexmask )
+ AttributeDescription *desc,
+ slap_mask_t *indexmask )
{
AttrInfo *a;
{
int rc;
int i;
- slap_index mask;
+ slap_mask_t mask;
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: "
mask = 0;
for ( i = 0; indexes[i] != NULL; i++ ) {
- slap_index index;
+ slap_mask_t index;
rc = slap_str2index( indexes[i], &index );
if( rc != LDAP_SUCCESS ) {
for ( i = 0; attrs[i] != NULL; i++ ) {
AttrInfo *a;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
AttributeDescription *ad;
const char *text;
-#endif
if( strcasecmp( attrs[i], "default" ) == 0 ) {
li->li_defaultmask = mask;
a = (AttrInfo *) ch_malloc( sizeof(AttrInfo) );
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
ad = NULL;
rc = slap_str2ad( attrs[i], &ad, &text );
return LDAP_INAPPROPRIATE_MATCHING;
}
- Debug( LDAP_DEBUG_CONFIG, "index %s 0x%04x\n",
- ad->ad_cname->bv_val, mask, 0 );
-
-#ifdef SLAPD_USE_AD
- a->ai_desc = ad;
-#else
- a->ai_desc = ch_strdup( ad->ad_cname->bv_val );
- ad_free( ad, 1 );
-#endif
+#ifdef NEW_LOGGING
+ LDAP_LOG( BACK_LDBM, DETAIL1,
+ "attr_index_config: index %s 0x%04lx\n",
+ ad->ad_cname.bv_val, mask, 0 );
#else
- a->ai_desc = ch_strdup( attrs[i] );
+ Debug( LDAP_DEBUG_CONFIG, "index %s 0x%04lx\n",
+ ad->ad_cname.bv_val, mask, 0 );
#endif
+
+ a->ai_desc = ad;
+
a->ai_indexmask = mask;
rc = avl_insert( &li->li_attrs, (caddr_t) a,
}
}
- 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
attr_index_destroy( Avlnode *tree )
{
- avl_free( tree, ainfo_free );
+ avl_free( tree, free );
}
-