/*
* Rewrite the compare dn, if needed
*/
- dc.li = li;
+ dc.rwmap = &li->rwmap;
#ifdef ENABLE_REWRITE
dc.conn = op->o_conn;
dc.rs = rs;
return -1;
}
- if ( op->oq_compare.rs_ava->aa_desc == slap_schema.si_ad_objectClass ) {
- ldap_back_map(&li->oc_map, &op->orc_ava->aa_value, &mapped_val,
- BACKLDAP_MAP);
+ if ( op->orc_ava->aa_desc == slap_schema.si_ad_objectClass
+ || op->orc_ava->aa_desc == slap_schema.si_ad_structuralObjectClass ) {
+ ldap_back_map(&li->rwmap.rwm_oc, &op->orc_ava->aa_value,
+ &mapped_val, BACKLDAP_MAP);
if (mapped_val.bv_val == NULL || mapped_val.bv_val[0] == '\0') {
return( -1 );
}
mapped_at = op->orc_ava->aa_desc->ad_cname;
} else {
- ldap_back_map(&li->at_map, &op->orc_ava->aa_desc->ad_cname, &mapped_at,
+ ldap_back_map(&li->rwmap.rwm_at,
+ &op->orc_ava->aa_desc->ad_cname, &mapped_at,
BACKLDAP_MAP);
if (mapped_at.bv_val == NULL || mapped_at.bv_val[0] == '\0') {
return( -1 );
}
if (op->orc_ava->aa_desc->ad_type->sat_syntax == slap_schema.si_syn_distinguishedName ) {
#ifdef ENABLE_REWRITE
- dc.ctx = "dnAttr";
+ dc.ctx = "compareAttrDN";
#endif
ldap_back_dn_massage( &dc, &op->orc_ava->aa_value, &mapped_val );
if (mapped_val.bv_val == NULL || mapped_val.bv_val[0] == '\0') {
mapped_val = op->orc_ava->aa_value;
+ } else if (mapped_val.bv_val != op->orc_ava->aa_value.bv_val) {
+ freeval = 1;
}
}
}
if ( mdn.bv_val != op->o_req_dn.bv_val ) {
free( mdn.bv_val );
}
+ if ( freeval ) {
+ free( mapped_val.bv_val );
+ }
return( ldap_back_op_result( lc, op, rs, msgid, 1 ) );
}