Skip to content
Snippets Groups Projects
Commit 86bd2da6 authored by Howard Chu's avatar Howard Chu Committed by Quanah Gibson-Mount
Browse files

Fix index delete 

Deleting all indices should also reset default mask
parent 324fdd0c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
servers/slapd/back-bdb/config.c
+ 2
− 1
View file @ 86bd2da6
...@@ -602,10 +602,11 @@ bdb_cf_gen( ConfigArgs *c ) ...@@ -602,10 +602,11 @@ bdb_cf_gen( ConfigArgs *c )
if ( c->valx == -1 ) { if ( c->valx == -1 ) {
int i; int i;
/* delete all (FIXME) */ /* delete all */
for ( i = 0; i < bdb->bi_nattrs; i++ ) { for ( i = 0; i < bdb->bi_nattrs; i++ ) {
bdb->bi_attrs[i]->ai_indexmask |= BDB_INDEX_DELETING; bdb->bi_attrs[i]->ai_indexmask |= BDB_INDEX_DELETING;
} }
bdb->bi_defaultmask = 0;
bdb->bi_flags |= BDB_DEL_INDEX; bdb->bi_flags |= BDB_DEL_INDEX;
c->cleanup = bdb_cf_cleanup; c->cleanup = bdb_cf_cleanup;
......
servers/slapd/back-mdb/config.c
+ 2
− 1
View file @ 86bd2da6
...@@ -423,10 +423,11 @@ mdb_cf_gen( ConfigArgs *c ) ...@@ -423,10 +423,11 @@ mdb_cf_gen( ConfigArgs *c )
if ( c->valx == -1 ) { if ( c->valx == -1 ) {
int i; int i;
/* delete all (FIXME) */ /* delete all */
for ( i = 0; i < mdb->mi_nattrs; i++ ) { for ( i = 0; i < mdb->mi_nattrs; i++ ) {
mdb->mi_attrs[i]->ai_indexmask |= MDB_INDEX_DELETING; mdb->mi_attrs[i]->ai_indexmask |= MDB_INDEX_DELETING;
} }
mdb->mi_defaultmask = 0;
mdb->mi_flags |= MDB_DEL_INDEX; mdb->mi_flags |= MDB_DEL_INDEX;
c->cleanup = mdb_cf_cleanup; c->cleanup = mdb_cf_cleanup;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment