Do not return pointers into BerElement we do not own

[openldap] / servers / slapd / back-ldbm / index.c

diff --git a/servers/slapd/back-ldbm/index.c b/servers/slapd/back-ldbm/index.c
index 3d715d71cf48462ee6456b6e62690af8ecfba11e..2f38768a8cdcda734ecad3765db84bba89de6288 100644 (file)
--- a/servers/slapd/back-ldbm/index.c
+++ b/servers/slapd/back-ldbm/index.c
@@ -1,7 +1,7 @@
 /* index.c - routines for dealing with attribute indexes */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -32,14 +32,14 @@ static slap_mask_t index_mask(
                return mask;
        }
 
-       /* If there is a language tag, did we ever index the base
+       /* If there is a tagging option, did we ever index the base
         * type? If so, check for mask, otherwise it's not there.
         */
-       if( slap_ad_is_lang( desc ) && desc != desc->ad_type->sat_ad ) {
-               /* has language tag */
+       if( slap_ad_is_tagged( desc ) && desc != desc->ad_type->sat_ad ) {
+               /* has tagging option */
                attr_mask( be->be_private, desc->ad_type->sat_ad, &mask );
 
-               if( mask && ( mask ^ SLAP_INDEX_NOLANG ) ) {
+               if( mask && ( mask ^ SLAP_INDEX_NOTAGS ) ) {
                        *atname = desc->ad_type->sat_cname;
                        *dbname = desc->ad_type->sat_cname.bv_val;
                        return mask;
@@ -54,12 +54,6 @@ static slap_mask_t index_mask(
                
                attr_mask( be->be_private, at->sat_ad, &mask );
 
-               if( mask & SLAP_INDEX_AUTO_SUBTYPES ) {
-                       *atname = desc->ad_type->sat_cname;
-                       *dbname = at->sat_cname.bv_val;
-                       return mask;
-               }
-
                if( mask && ( mask ^ SLAP_INDEX_NOSUBTYPES ) ) {
                        *atname = at->sat_cname;
                        *dbname = at->sat_cname.bv_val;
@@ -74,7 +68,6 @@ int index_is_indexed(
        Backend *be,
        AttributeDescription *desc )
 {
-       int rc;
        slap_mask_t mask;
        char *dbname;
        struct berval prefix;
@@ -85,7 +78,7 @@ int index_is_indexed(
                return LDAP_INAPPROPRIATE_MATCHING;
        }
 
-       return LDAP_SUCCESS;
+       return LDAP_SUCCESS;
 }
 
 int index_param(
@@ -167,9 +160,8 @@ static int indexer(
        
        if ( db == NULL ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "index", LDAP_LEVEL_ERR,
-                          "index_read: Could not open db %s%s\n",
-                          dbname, LDBM_SUFFIX ));
+               LDAP_LOG( INDEX, ERR, 
+                          "index_read: Could not open db %s%s\n", dbname, LDBM_SUFFIX, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                    "<= index_read NULL (could not open %s%s)\n",
@@ -238,22 +230,18 @@ static int indexer(
 static int index_at_values(
        Backend *be,
        AttributeType *type,
-       struct berval *lang,
+       struct berval *tags,
        BerVarray vals,
        ID id,
-       int op,
-       char ** dbnamep,
-       slap_mask_t *maskp )
+       int op )
 {
        slap_mask_t mask = 0;
-       slap_mask_t tmpmask = 0;
 
        if( type->sat_sup ) {
                /* recurse */
                (void) index_at_values( be,
-                       type->sat_sup, lang,
-                       vals, id, op,
-                       dbnamep, &tmpmask );
+                       type->sat_sup, tags,
+                       vals, id, op );
        }
 
        /* If this type has no AD, we've never used it before */
@@ -262,47 +250,26 @@ static int index_at_values(
        }
 
        if( mask ) {
-               *dbnamep = type->sat_cname.bv_val;
-       } else if ( tmpmask & SLAP_INDEX_AUTO_SUBTYPES ) {
-               mask = tmpmask;
-       }
-
-       if( mask ) {
-               indexer( be, *dbnamep,
+               indexer( be, type->sat_cname.bv_val,
                        &type->sat_cname,
                        vals, id, op,
                        mask );
-               if ( mask & SLAP_INDEX_AUTO_SUBTYPES ) {
-                       *maskp = mask;
-               }
        }
 
-       if( lang->bv_len ) {
-               char *dbname = NULL;
-               struct berval lname;
+       if( tags->bv_len ) {
                AttributeDescription *desc;
 
-               tmpmask = 0;
-               lname.bv_val = NULL;
+               mask = 0;
 
-               desc = ad_find_lang(type, lang);
+               desc = ad_find_tags(type, tags);
                if( desc ) {
-                       attr_mask( be->be_private, desc, &tmpmask );
-               }
-
-               if( tmpmask ) {
-                       dbname = desc->ad_cname.bv_val;
-                       lname = desc->ad_cname;
-                       mask = tmpmask;
+                       attr_mask( be->be_private, desc, &mask );
                }
 
-               if( dbname != NULL ) {
-                       indexer( be, dbname, &lname,
+               if( mask ) {
+                       indexer( be, desc->ad_cname.bv_val, &desc->ad_cname,
                                vals, id, op,
                                mask );
-                       if( !tmpmask ) {
-                               ch_free( lname.bv_val );
-                       }
                }
        }
 
@@ -316,29 +283,24 @@ int index_values(
        ID id,
        int op )
 {
-       char *dbname = NULL;
-       slap_mask_t mask;
-
        (void) index_at_values( be,
-               desc->ad_type, &desc->ad_lang,
-               vals, id, op,
-               &dbname, &mask );
+               desc->ad_type, &desc->ad_tags,
+               vals, id, op );
 
        return LDAP_SUCCESS;
 }
 
 int
 index_entry(
-    Backend    *be,
+       Backend *be,
        int op,
-    Entry *e,
-       Attribute *ap )
+       Entry *e )
 {
+       Attribute *ap = e->e_attrs;
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "index", LDAP_LEVEL_ENTRY,
-                  "index_entry: %s (%s)%ld\n",
-                  op == SLAP_INDEX_ADD_OP ? "add" : "del",
-                  e->e_dn, e->e_id ));
+       LDAP_LOG( INDEX, ENTRY, 
+               "index_entry: %s (%s)%ld\n", op == SLAP_INDEX_ADD_OP ? "add" : "del",
+               e->e_dn, e->e_id );
 #else
        Debug( LDAP_DEBUG_TRACE, "=> index_entry_%s( %ld, \"%s\" )\n",
                op == SLAP_INDEX_ADD_OP ? "add" : "del",
@@ -347,12 +309,17 @@ index_entry(
 
        /* add each attribute to the indexes */
        for ( ; ap != NULL; ap = ap->a_next ) {
-               index_values( be, ap->a_desc, ap->a_vals, e->e_id, op );
+               index_values( be, ap->a_desc,
+#ifdef SLAP_NVALUES
+                       ap->a_nvals,
+#else
+                       ap->a_vals,
+#endif
+                       e->e_id, op );
        }
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "index", LDAP_LEVEL_ENTRY,
-                  "index_entry: success\n" ));
+       LDAP_LOG( INDEX, ENTRY, "index_entry: success\n", 0, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "<= index_entry_%s( %ld, \"%s\" ) success\n",
            op == SLAP_INDEX_ADD_OP ? "add" : "del",