]> git.sur5r.net Git - openldap/commitdiff
error out when adding multiple olcIndex values for the same attribute (ITS#6196)
authorRalf Haferkamp <ralf@openldap.org>
Fri, 3 Jul 2009 14:29:40 +0000 (14:29 +0000)
committerRalf Haferkamp <ralf@openldap.org>
Fri, 3 Jul 2009 14:29:40 +0000 (14:29 +0000)
servers/slapd/back-bdb/attr.c

index 54cb2e4ac6269f3f5a223b617993cc7e4c79c79e..2e5a5e56d0893e129d6f68678e17f14469357f5b 100644 (file)
@@ -319,15 +319,20 @@ bdb_attr_index_config(
                if( rc ) {
                        if ( bdb->bi_flags & BDB_IS_OPEN ) {
                                AttrInfo *b = bdb_attr_mask( bdb, ad );
-                               /* If we were editing this attr, reset it */
-                               b->ai_indexmask &= ~BDB_INDEX_DELETING;
-                               /* If this is leftover from a previous add, commit it */
-                               if ( b->ai_newmask )
-                                       b->ai_indexmask = b->ai_newmask;
-                               b->ai_newmask = a->ai_newmask;
-                               ch_free( a );
-                               rc = 0;
-                               continue;
+                               /* If there is already an index defined for this attribute
+                                * it must be replaced. Otherwise we end up with multiple 
+                                * olcIndex values for the same attribute */
+                               if ( b->ai_indexmask & BDB_INDEX_DELETING ) {
+                                       /* If we were editing this attr, reset it */
+                                       b->ai_indexmask &= ~BDB_INDEX_DELETING;
+                                       /* If this is leftover from a previous add, commit it */
+                                       if ( b->ai_newmask )
+                                               b->ai_indexmask = b->ai_newmask;
+                                       b->ai_newmask = a->ai_newmask;
+                                       ch_free( a );
+                                       rc = 0;
+                                       continue;
+                               }
                        }
                        if (c_reply) {
                                snprintf(c_reply->msg, sizeof(c_reply->msg),