Commit f4cfb13f authored by Howard Chu's avatar Howard Chu
Browse files

Fix previous commit

parent 11802791
...@@ -57,11 +57,17 @@ static slap_mask_t index_mask( ...@@ -57,11 +57,17 @@ static slap_mask_t index_mask(
bdb_attr_mask( be->be_private, at->sat_ad, &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; *atname = desc->ad_type->sat_cname;
*dbname = at->sat_cname.bv_val; *dbname = at->sat_cname.bv_val;
return mask; return mask;
} }
if ( mask && ( mask ^ SLAP_INDEX_NOSUBTYPES ) ) {
*atname = at->sat_cname;
*dbname = at->sat_cname.bv_val;
return mask;
}
} }
return 0; return 0;
...@@ -291,8 +297,9 @@ static int index_at_values( ...@@ -291,8 +297,9 @@ static int index_at_values(
if( mask ) { if( mask ) {
*dbnamep = type->sat_cname.bv_val; *dbnamep = type->sat_cname.bv_val;
} else if ( tmpmask ^ SLAP_INDEX_NOSUBTYPES ) { } else if ( tmpmask & SLAP_INDEX_AUTO_SUBTYPES ) {
mask = tmpmask; mask = tmpmask;
*maskp = mask;
} }
if( mask ) { if( mask ) {
...@@ -302,7 +309,6 @@ static int index_at_values( ...@@ -302,7 +309,6 @@ static int index_at_values(
mask ); mask );
if( rc ) return rc; if( rc ) return rc;
*maskp = mask;
} }
if( lang->bv_len ) { if( lang->bv_len ) {
......
...@@ -54,11 +54,17 @@ static slap_mask_t index_mask( ...@@ -54,11 +54,17 @@ static slap_mask_t index_mask(
attr_mask( be->be_private, at->sat_ad, &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; *atname = desc->ad_type->sat_cname;
*dbname = at->sat_cname.bv_val; *dbname = at->sat_cname.bv_val;
return mask; return mask;
} }
if( mask && ( mask ^ SLAP_INDEX_NOSUBTYPES ) ) {
*atname = at->sat_cname;
*dbname = at->sat_cname.bv_val;
return mask;
}
} }
return 0; return 0;
...@@ -257,8 +263,9 @@ static int index_at_values( ...@@ -257,8 +263,9 @@ static int index_at_values(
if( mask ) { if( mask ) {
*dbnamep = type->sat_cname.bv_val; *dbnamep = type->sat_cname.bv_val;
} else if ( tmpmask ^ SLAP_INDEX_NOSUBTYPES ) { } else if ( tmpmask & SLAP_INDEX_AUTO_SUBTYPES ) {
mask = tmpmask; mask = tmpmask;
*maskp = mask;
} }
if( mask ) { if( mask ) {
...@@ -266,7 +273,6 @@ static int index_at_values( ...@@ -266,7 +273,6 @@ static int index_at_values(
&type->sat_cname, &type->sat_cname,
vals, id, op, vals, id, op,
mask ); mask );
*maskp = mask;
} }
if( lang->bv_len ) { if( lang->bv_len ) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment