struct berval mdn = BER_BVNULL;
struct berval mapped;
dncookie dc;
+ int msgid;
int do_retry = 1;
mc = meta_back_getconn( op, rs, &candidate, LDAP_BACK_SENDERR );
/*
* Rewrite the modify dn, if needed
*/
- dc.rwmap = &mi->mi_targets[ candidate ]->mt_rwmap;
+ dc.target = &mi->mi_targets[ candidate ];
dc.conn = op->o_conn;
dc.rs = rs;
dc.ctx = "modifyDN";
for ( i = 0, ml = op->orm_modlist; ml; ml = ml->sml_next ) {
int j, is_oc = 0;
- if ( !isupdate && ml->sml_desc->ad_type->sat_no_user_mod ) {
+ if ( !isupdate && !get_manageDIT( op ) && ml->sml_desc->ad_type->sat_no_user_mod )
+ {
continue;
}
mapped = ml->sml_desc->ad_cname;
} else {
- ldap_back_map( &mi->mi_targets[ candidate ]->mt_rwmap.rwm_at,
+ ldap_back_map( &mi->mi_targets[ candidate ].mt_rwmap.rwm_at,
&ml->sml_desc->ad_cname, &mapped,
BACKLDAP_MAP );
if ( BER_BVISNULL( &mapped ) || BER_BVISEMPTY( &mapped ) ) {
for ( j = 0; !BER_BVISNULL( &ml->sml_values[ j ] ); ) {
struct ldapmapping *mapping;
- ldap_back_mapping( &mi->mi_targets[ candidate ]->mt_rwmap.rwm_oc,
+ ldap_back_mapping( &mi->mi_targets[ candidate ].mt_rwmap.rwm_oc,
&ml->sml_values[ j ], &mapping, BACKLDAP_MAP );
if ( mapping == NULL ) {
- if ( mi->mi_targets[ candidate ]->mt_rwmap.rwm_oc.drop_missing ) {
+ if ( mi->mi_targets[ candidate ].mt_rwmap.rwm_oc.drop_missing ) {
continue;
}
mods[ i ].mod_bvalues[ j ] = &ml->sml_values[ j ];
modv[ i ] = 0;
retry:;
- rs->sr_err = ldap_modify_ext_s( mc->mc_conns[ candidate ].msc_ld, mdn.bv_val,
- modv, op->o_ctrls, NULL );
+ rs->sr_err = ldap_modify_ext( mc->mc_conns[ candidate ].msc_ld, mdn.bv_val,
+ modv, op->o_ctrls, NULL, &msgid );
if ( rs->sr_err == LDAP_UNAVAILABLE && do_retry ) {
do_retry = 0;
if ( meta_back_retry( op, rs, mc, candidate, LDAP_BACK_SENDERR ) ) {
goto retry;
}
+
+ } else if ( rs->sr_err == LDAP_SUCCESS ) {
+ struct timeval tv, *tvp = NULL;
+ LDAPMessage *res = NULL;
+
+ if ( mi->mi_targets[ candidate ].mt_timeout[ META_OP_MODIFY ] != 0 ) {
+ tv.tv_sec = mi->mi_targets[ candidate ].mt_timeout[ META_OP_MODIFY ];
+ tv.tv_usec = 0;
+ tvp = &tv;
+ }
+
+ rs->sr_err = LDAP_OTHER;
+ rc = ldap_result( mc->mc_conns[ candidate ].msc_ld,
+ msgid, LDAP_MSG_ONE, tvp, &res );
+ switch ( rc ) {
+ case -1:
+ rc = -1;
+ break;
+
+ case 0:
+ ldap_abandon_ext( mc->mc_conns[ candidate ].msc_ld,
+ msgid, NULL, NULL );
+ rs->sr_err = op->o_protocol >= LDAP_VERSION3 ?
+ LDAP_ADMINLIMIT_EXCEEDED : LDAP_OPERATIONS_ERROR;
+ rc = -1;
+ break;
+
+ case LDAP_RES_MODIFY:
+ rc = ldap_parse_result( mc->mc_conns[ candidate ].msc_ld,
+ res, &rs->sr_err, NULL, NULL, NULL, NULL, 1 );
+ if ( rc != LDAP_SUCCESS ) {
+ rs->sr_err = rc;
+ }
+ rc = 0;
+ break;
+
+ default:
+ rc = -1;
+ ldap_msgfree( res );
+ break;
+ }
}
cleanup:;
free( modv );
if ( rc != -1 ) {
- return meta_back_op_result( mc, op, rs, candidate );
+ rc = meta_back_op_result( mc, op, rs, candidate );
+
+ } else {
+ send_ldap_result( op, rs );
+ rc = 0;
}
-
- send_ldap_result( op, rs );
- return rs->sr_err;
+ meta_back_release_conn( op, mc );
+
+ return rc;
}