Fix index delete

Deleting all indices should also reset default mask

diff --git a/servers/slapd/back-bdb/config.c b/servers/slapd/back-bdb/config.c
index a1cd0d605e0ad87456878d11817b799b1f9ef64b..24c4753ba3a465861137311fbcbb5a47eac33c0a 100644 (file)
--- a/servers/slapd/back-bdb/config.c
+++ b/servers/slapd/back-bdb/config.c
@@ -602,10 +602,11 @@ bdb_cf_gen( ConfigArgs *c )
                        if ( c->valx == -1 ) {
                                int i;
 
-                               /* delete all (FIXME) */
+                               /* delete all */
                                for ( i = 0; i < bdb->bi_nattrs; i++ ) {
                                        bdb->bi_attrs[i]->ai_indexmask |= BDB_INDEX_DELETING;
                                }
+                               bdb->bi_defaultmask = 0;
                                bdb->bi_flags |= BDB_DEL_INDEX;
                                c->cleanup = bdb_cf_cleanup;
 

diff --git a/servers/slapd/back-mdb/config.c b/servers/slapd/back-mdb/config.c
index 56ed89017d165ef6ce085f18bd33efb68e13f603..db6b0f5a93db6e63f6c8d66a75760254068c6412 100644 (file)
--- a/servers/slapd/back-mdb/config.c
+++ b/servers/slapd/back-mdb/config.c
@@ -440,10 +440,11 @@ mdb_cf_gen( ConfigArgs *c )
                        if ( c->valx == -1 ) {
                                int i;
 
-                               /* delete all (FIXME) */
+                               /* delete all */
                                for ( i = 0; i < mdb->mi_nattrs; i++ ) {
                                        mdb->mi_attrs[i]->ai_indexmask |= MDB_INDEX_DELETING;
                                }
+                               mdb->mi_defaultmask = 0;
                                mdb->mi_flags |= MDB_DEL_INDEX;
                                c->cleanup = mdb_cf_cleanup;