From: Howard Chu <hyc@openldap.org>
Date: Mon, 14 Jan 2002 20:49:06 +0000 (+0000)
Subject: More fixes for autosubtype index generation
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~132
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fde56a188c241ce5a61e0fee4b6339d58436ddfc;p=openldap

More fixes for autosubtype index generation
---

diff --git a/servers/slapd/back-bdb/index.c b/servers/slapd/back-bdb/index.c
index c42beef611..70cefa145a 100644
--- 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 8bfc8da2f3..3d715d71cf 100644
--- 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 ) {