meta_back_compare( Operation *op, SlapReply *rs )
{
metainfo_t *mi = ( metainfo_t * )op->o_bd->be_private;
- metaconn_t *mc;
- metasingleconn_t *msc;
+ metaconn_t *mc = NULL;
char *match = NULL,
*err = NULL;
struct berval mmatch = BER_BVNULL;
msgid = ch_calloc( sizeof( int ), mi->mi_ntargets );
if ( msgid == NULL ) {
- return -1;
+ send_ldap_error( op, rs, LDAP_OTHER, NULL );
+ rc = LDAP_OTHER;
+ goto done;
}
/*
dc.rs = rs;
dc.ctx = "compareDN";
- for ( i = 0, msc = &mc->mc_conns[ 0 ]; !META_LAST( msc ); ++i, ++msc ) {
- struct berval mdn = BER_BVNULL;
- struct berval mapped_attr = op->orc_ava->aa_desc->ad_cname;
- struct berval mapped_value = op->orc_ava->aa_value;
+ for ( i = 0; i < mi->mi_ntargets; i++ ) {
+ struct berval mdn = BER_BVNULL;
+ struct berval mapped_attr = op->orc_ava->aa_desc->ad_cname;
+ struct berval mapped_value = op->orc_ava->aa_value;
if ( candidates[ i ].sr_tag != META_CANDIDATE ) {
msgid[ i ] = -1;
/*
* Rewrite the compare dn, if needed
*/
- dc.rwmap = &mi->mi_targets[ i ]->mt_rwmap;
+ dc.target = &mi->mi_targets[ i ];
switch ( ldap_back_dn_massage( &dc, &op->o_req_dn, &mdn ) ) {
case LDAP_UNWILLING_TO_PERFORM:
* if attr is objectClass, try to remap the value
*/
if ( op->orc_ava->aa_desc == slap_schema.si_ad_objectClass ) {
- ldap_back_map( &mi->mi_targets[ i ]->mt_rwmap.rwm_oc,
+ ldap_back_map( &mi->mi_targets[ i ].mt_rwmap.rwm_oc,
&op->orc_ava->aa_value,
&mapped_value, BACKLDAP_MAP );
* else try to remap the attribute
*/
} else {
- ldap_back_map( &mi->mi_targets[ i ]->mt_rwmap.rwm_at,
+ ldap_back_map( &mi->mi_targets[ i ].mt_rwmap.rwm_at,
&op->orc_ava->aa_desc->ad_cname,
&mapped_attr, BACKLDAP_MAP );
if ( BER_BVISNULL( &mapped_attr ) || mapped_attr.bv_val[0] == '\0' ) {
/*
* FIXME: should we check for abandon?
*/
- for ( i = 0, msc = &mc->mc_conns[ 0 ]; !META_LAST( msc ); msc++, i++ ) {
- int lrc;
- LDAPMessage *res = NULL;
- struct timeval tv = { 0 };
+ for ( i = 0; i < mi->mi_ntargets; i++ ) {
+ metasingleconn_t *msc = &mc->mc_conns[ i ];
+ int lrc;
+ LDAPMessage *res = NULL;
+ struct timeval tv;
- tv.tv_sec = 0;
- tv.tv_usec = 0;
+ LDAP_BACK_TV_SET( &tv );
if ( msgid[ i ] == -1 ) {
continue;
* At least one compare failed with matched portion,
* and none was successful
*/
- } else if ( match != NULL && match[0] != '\0' ) {
- struct berval matched;
+ } else if ( match != NULL && match[ 0 ] != '\0' ) {
+ struct berval matched, pmatched;
ber_str2bv( match, 0, 0, &matched );
dc.ctx = "matchedDN";
ldap_back_dn_massage( &dc, &matched, &mmatch );
+ if ( dnPretty( NULL, &mmatch, &pmatched, NULL ) == LDAP_SUCCESS ) {
+ if ( mmatch.bv_val != match ) {
+ free( mmatch.bv_val );
+ }
+ mmatch = pmatched;
+ }
}
if ( rres != LDAP_SUCCESS ) {
if ( msgid ) {
free( msgid );
}
-
+
+done:;
+ meta_back_release_conn( op, mc );
+
return rc;
}