upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-30 11:39:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix previous commit

Browse source
This commit is contained in:
Howard Chu 2002-01-14 20:26:51 +00:00
parent 1180279104
commit f4cfb13f2c
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
servers/slapd/back-bdb/index.c
View file

@ -57,11 +57,17 @@ static slap_mask_t index_mask(
bdb_attr_mask( be->be_private, at->sat_ad, &mask );
if ( mask && ( mask ^ SLAP_INDEX_NOSUBTYPES ) ) {
if ( mask & SLAP_INDEX_AUTO_SUBTYPES ) {
*atname = desc->ad_type->sat_cname;
*dbname = at->sat_cname.bv_val;
return mask;
}
if ( mask && ( mask ^ SLAP_INDEX_NOSUBTYPES ) ) {
*atname = at->sat_cname;
*dbname = at->sat_cname.bv_val;
return mask;
}
}
return 0;
@ -291,8 +297,9 @@ static int index_at_values(
if( mask ) {
*dbnamep = type->sat_cname.bv_val;
} else if ( tmpmask ^ SLAP_INDEX_NOSUBTYPES ) {
} else if ( tmpmask & SLAP_INDEX_AUTO_SUBTYPES ) {
mask = tmpmask;
*maskp = mask;
}
if( mask ) {
@ -302,7 +309,6 @@ static int index_at_values(
mask );
if( rc ) return rc;
*maskp = mask;
}
if( lang->bv_len ) {

12
servers/slapd/back-ldbm/index.c
View file

@ -54,11 +54,17 @@ static slap_mask_t index_mask(
attr_mask( be->be_private, at->sat_ad, &mask );
if( mask && ( mask ^ SLAP_INDEX_NOSUBTYPES ) ) {
if( mask & SLAP_INDEX_AUTO_SUBTYPES ) {
*atname = desc->ad_type->sat_cname;
*dbname = at->sat_cname.bv_val;
return mask;
}
if( mask && ( mask ^ SLAP_INDEX_NOSUBTYPES ) ) {
*atname = at->sat_cname;
*dbname = at->sat_cname.bv_val;
return mask;
}
}
return 0;
@ -257,8 +263,9 @@ static int index_at_values(
if( mask ) {
*dbnamep = type->sat_cname.bv_val;
} else if ( tmpmask ^ SLAP_INDEX_NOSUBTYPES ) {
} else if ( tmpmask & SLAP_INDEX_AUTO_SUBTYPES ) {
mask = tmpmask;
*maskp = mask;
}
if( mask ) {
@ -266,7 +273,6 @@ static int index_at_values(
&type->sat_cname,
vals, id, op,
mask );
*maskp = mask;
}
if( lang->bv_len ) {