- if( slap_ad_is_lang( desc ) ) {
- /* has language tag */
- bdb_attr_mask( be->be_private, desc->ad_type->sat_cname, &mask );
+ /* If there is a tagging option, did we ever index the base
+ * type? If so, check for mask, otherwise it's not there.
+ */
+ if( slap_ad_is_tagged( desc ) && desc != desc->ad_type->sat_ad ) {
+ /* has tagging option */
+ bdb_attr_mask( be->be_private, desc->ad_type->sat_ad, &mask );