X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-meta%2Fmodify.c;h=62a041a17f5f6904cadd82482c8782d0a68a5fc0;hb=52165180f7713b5fdebef933a9dca8842daa2e2a;hp=77e92da1455e791ed06a2c48168e3c4c19a2dc12;hpb=0057b66f87c34d0252ce23d22c60e85d16e3b916;p=openldap

diff --git a/servers/slapd/back-meta/modify.c b/servers/slapd/back-meta/modify.c
index 77e92da145..62a041a17f 100644
--- a/servers/slapd/back-meta/modify.c
+++ b/servers/slapd/back-meta/modify.c
@@ -34,8 +34,8 @@
 int
 meta_back_modify( Operation *op, SlapReply *rs )
 {
-	struct metainfo	*li = ( struct metainfo * )op->o_bd->be_private;
-	struct metaconn	*lc;
+	metainfo_t	*mi = ( metainfo_t * )op->o_bd->be_private;
+	metaconn_t	*mc;
 	int		rc = 0;
 	LDAPMod		**modv = NULL;
 	LDAPMod		*mods = NULL;
@@ -45,30 +45,19 @@ meta_back_modify( Operation *op, SlapReply *rs )
 	struct berval	mdn = BER_BVNULL;
 	struct berval	mapped;
 	dncookie	dc;
+	int		do_retry = 1;
 
-	lc = meta_back_getconn( op, rs, META_OP_REQUIRE_SINGLE,
-			&op->o_req_ndn, &candidate );
-	if ( !lc ) {
-		rc = -1;
-		goto cleanup;
-	}
-	
-	if ( !meta_back_dobind( lc, op ) ) {
-		rs->sr_err = LDAP_UNAVAILABLE;
-
-	} else if ( !meta_back_is_valid( lc, candidate ) ) {
-		rs->sr_err = LDAP_OTHER;
+	mc = meta_back_getconn( op, rs, &candidate, LDAP_BACK_SENDERR );
+	if ( !mc || !meta_back_dobind( op, rs, mc, LDAP_BACK_SENDERR ) ) {
+		return rs->sr_err;
 	}
 
-	if ( rs->sr_err != LDAP_SUCCESS ) {
-		rc = -1;
-		goto cleanup;
-	}
+	assert( mc->mc_conns[ candidate ].msc_ld != NULL );
 
 	/*
 	 * Rewrite the modify dn, if needed
 	 */
-	dc.rwmap = &li->targets[ candidate ]->mt_rwmap;
+	dc.target = &mi->mi_targets[ candidate ];
 	dc.conn = op->o_conn;
 	dc.rs = rs;
 	dc.ctx = "modifyDN";
@@ -110,7 +99,7 @@ meta_back_modify( Operation *op, SlapReply *rs )
 			mapped = ml->sml_desc->ad_cname;
 
 		} else {
-			ldap_back_map( &li->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 ) ) {
@@ -134,15 +123,22 @@ meta_back_modify( Operation *op, SlapReply *rs )
 				mods[ i ].mod_bvalues =
 					(struct berval **)ch_malloc( ( j + 1 ) *
 					sizeof( struct berval * ) );
-				for ( j = 0; !BER_BVISNULL( &ml->sml_values[ j ] ); j++ ) {
-					ldap_back_map( &li->targets[ candidate ]->mt_rwmap.rwm_oc,
-							&ml->sml_values[ j ],
-							&mapped, BACKLDAP_MAP );
-					if ( BER_BVISNULL( &mapped ) || BER_BVISEMPTY( &mapped ) )
-					{
-						continue;
+				for ( j = 0; !BER_BVISNULL( &ml->sml_values[ j ] ); ) {
+					struct ldapmapping	*mapping;
+
+					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 ) {
+							continue;
+						}
+						mods[ i ].mod_bvalues[ j ] = &ml->sml_values[ j ];
+
+					} else {
+						mods[ i ].mod_bvalues[ j ] = &mapping->dst;
 					}
-					mods[ i ].mod_bvalues[ j ] = &mapped;
+					j++;
 				}
 				mods[ i ].mod_bvalues[ j ] = NULL;
 
@@ -175,8 +171,15 @@ meta_back_modify( Operation *op, SlapReply *rs )
 	}
 	modv[ i ] = 0;
 
-	rs->sr_err = ldap_modify_ext_s( lc->mc_conns[ candidate ].msc_ld, mdn.bv_val,
-			modv, NULL, NULL );
+retry:;
+	rs->sr_err = ldap_modify_ext_s( mc->mc_conns[ candidate ].msc_ld, mdn.bv_val,
+			modv, op->o_ctrls, NULL );
+	if ( rs->sr_err == LDAP_UNAVAILABLE && do_retry ) {
+		do_retry = 0;
+		if ( meta_back_retry( op, rs, mc, candidate, LDAP_BACK_SENDERR ) ) {
+			goto retry;
+		}
+	}
 
 cleanup:;
 	if ( mdn.bv_val != op->o_req_dn.bv_val ) {
@@ -192,7 +195,7 @@ cleanup:;
 	free( modv );
 
 	if ( rc != -1 ) {
-		return meta_back_op_result( lc, op, rs );
+		return meta_back_op_result( mc, op, rs, candidate );
 	}
 	
 	send_ldap_result( op, rs );