More fixes for autosubtype index generation

diff --git a/servers/slapd/back-bdb/index.c b/servers/slapd/back-bdb/index.c
index c42beef611ab3f64277a2213e643c17206d5b014..70cefa145a9d0e6ca44361417602d361fa67270d 100644 (file)
--- a/servers/slapd/back-bdb/index.c
+++ b/servers/slapd/back-bdb/index.c
@@ -299,7 +299,6 @@ static int index_at_values(
                *dbnamep = type->sat_cname.bv_val;
        } else if ( tmpmask & SLAP_INDEX_AUTO_SUBTYPES ) {
                mask = tmpmask;
-               *maskp = mask;
        }
 
        if( mask ) {
@@ -309,6 +308,9 @@ static int index_at_values(
                        mask );
 
                if( rc ) return rc;
+               if( mask & SLAP_INDEX_AUTO_SUBTYPES ) {
+                       *maskp = mask;
+               }
        }
 
        if( lang->bv_len ) {

diff --git a/servers/slapd/back-ldbm/index.c b/servers/slapd/back-ldbm/index.c
index 8bfc8da2f3ba9ab2f694f9c54c7a0852b83c2a77..3d715d71cf48462ee6456b6e62690af8ecfba11e 100644 (file)
--- a/servers/slapd/back-ldbm/index.c
+++ b/servers/slapd/back-ldbm/index.c
@@ -265,7 +265,6 @@ static int index_at_values(
                *dbnamep = type->sat_cname.bv_val;
        } else if ( tmpmask & SLAP_INDEX_AUTO_SUBTYPES ) {
                mask = tmpmask;
-               *maskp = mask;
        }
 
        if( mask ) {
@@ -273,6 +272,9 @@ static int index_at_values(
                        &type->sat_cname,
                        vals, id, op,
                        mask );
+               if ( mask & SLAP_INDEX_AUTO_SUBTYPES ) {
+                       *maskp = mask;
+               }
        }
 
        if( lang->bv_len ) {