ITS#4088 force cursors to use same locker

[openldap] / servers / slapd / back-bdb / attr.c

diff --git a/servers/slapd/back-bdb/attr.c b/servers/slapd/back-bdb/attr.c
index 395455318b8c4d059333280df7b7c4eeb5665815..f058c1f59672ddcda65b19638977d5d8ee64b923 100644 (file)
--- a/servers/slapd/back-bdb/attr.c
+++ b/servers/slapd/back-bdb/attr.c
@@ -258,7 +258,7 @@ bdb_attr_index_config(
                                continue;
                        }
                        fprintf( stderr, "%s: line %d: duplicate index definition "
-                               "for attr \"%s\" (ignored)\n",
+                               "for attr \"%s\"" SLAPD_CONF_UNKNOWN_IGNORED ".\n",
                                fname, lineno, attrs[i] );
 
                        return LDAP_PARAM_ERROR;
@@ -289,6 +289,7 @@ bdb_attr_index_unparser( void *v1, void *v2 )
                bv.bv_val = ptr;
                ber_bvarray_add( bva, &bv );
        }
+       return 0;
 }
 
 static AttributeDescription addef = { NULL, NULL, BER_BVC("default") };
@@ -305,8 +306,9 @@ bdb_attr_index_unparse( struct bdb_info *bdb, BerVarray *bva )
 }
 
 static void
-bdb_attrinfo_free( AttrInfo *ai )
+bdb_attrinfo_free( void *v )
 {
+       AttrInfo *ai = v;
 #ifdef LDAP_COMP_MATCH
        free( ai->ai_cr );
 #endif
@@ -359,6 +361,7 @@ void bdb_attr_flush( struct bdb_info *bdb )
        while (( a2 = al )) {
                al = al->next;
                avl_delete( &bdb->bi_attrs, a2->ptr, ainfo_cmp );
+               bdb_attrinfo_free( a2->ptr );
                ch_free( a2 );
        }
 }