ITS#3796 fix IDL cache lock setup/teardown

[openldap] / servers / slapd / back-meta / modify.c

diff --git a/servers/slapd/back-meta/modify.c b/servers/slapd/back-meta/modify.c
index 1eed28ccc08f6e08f989a5b592bc830abc6d6bb2..62a041a17f5f6904cadd82482c8782d0a68a5fc0 100644 (file)
--- 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;
+       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 ( !meta_back_dobind( lc, op ) ) {
-               rs->sr_err = LDAP_UNAVAILABLE;
 
-       } else if ( !meta_back_is_valid( lc, candidate ) ) {
-               rs->sr_err = LDAP_OTHER;
-       }
-
-       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";
@@ -97,17 +86,25 @@ meta_back_modify( Operation *op, SlapReply *rs )
        dc.ctx = "modifyAttrDN";
        isupdate = be_shadow_update( op );
        for ( i = 0, ml = op->orm_modlist; ml; ml = ml->sml_next ) {
-               int j;
+               int     j, is_oc = 0;
 
                if ( !isupdate && ml->sml_desc->ad_type->sat_no_user_mod  ) {
                        continue;
                }
 
-               ldap_back_map( &li->targets[ candidate ]->mt_rwmap.rwm_at,
-                               &ml->sml_desc->ad_cname, &mapped,
-                               BACKLDAP_MAP );
-               if ( BER_BVISNULL( &mapped ) || BER_BVISEMPTY( &mapped ) ) {
-                       continue;
+               if ( ml->sml_desc == slap_schema.si_ad_objectClass 
+                               || ml->sml_desc == slap_schema.si_ad_structuralObjectClass )
+               {
+                       is_oc = 1;
+                       mapped = ml->sml_desc->ad_cname;
+
+               } else {
+                       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 ) ) {
+                               continue;
+                       }
                }
 
                modv[ i ] = &mods[ i ];
@@ -120,19 +117,46 @@ meta_back_modify( Operation *op, SlapReply *rs )
                 * level.
                 */
                if ( ml->sml_values != NULL ) {
-                       /* mod_op must be delete all values */
-                       if ( strcmp( ml->sml_desc->ad_type->sat_syntax->ssyn_oid,
-                                               SLAPD_DN_SYNTAX ) == 0 )
-                       {
-                               ( void )ldap_dnattr_rewrite( &dc, ml->sml_values );
-                       }
+                       if ( is_oc ) {
+                               for ( j = 0; !BER_BVISNULL( &ml->sml_values[ j ] ); j++ )
+                                       ;
+                               mods[ i ].mod_bvalues =
+                                       (struct berval **)ch_malloc( ( j + 1 ) *
+                                       sizeof( struct berval * ) );
+                               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;
+                                       }
+                                       j++;
+                               }
+                               mods[ i ].mod_bvalues[ j ] = NULL;
+
+                       } else {
+                               if ( ml->sml_desc->ad_type->sat_syntax ==
+                                               slap_schema.si_syn_distinguishedName )
+                               {
+                                       ( void )ldap_dnattr_rewrite( &dc, ml->sml_values );
+                                       if ( ml->sml_values == NULL ) {
+                                               continue;
+                                       }
+                               }
 
-                       if ( ml->sml_values != NULL ) {
                                for ( j = 0; !BER_BVISNULL( &ml->sml_values[ j ] ); j++ )
                                        ;
                                mods[ i ].mod_bvalues =
                                        (struct berval **)ch_malloc( ( j + 1 ) *
-                                       sizeof(struct berval *) );
+                                       sizeof( struct berval * ) );
                                for ( j = 0; !BER_BVISNULL( &ml->sml_values[ j ] ); j++ ) {
                                        mods[ i ].mod_bvalues[ j ] = &ml->sml_values[ j ];
                                }
@@ -147,8 +171,15 @@ meta_back_modify( Operation *op, SlapReply *rs )
        }
        modv[ i ] = 0;
 
-       rc = ldap_modify_ext_s( lc->mc_conns[ candidate ].msc_ld, mdn.bv_val,
-                       modv, NULL, NULL ) != LDAP_SUCCESS;
+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 ) {
@@ -162,14 +193,13 @@ cleanup:;
        }
        free( mods );
        free( modv );
-       
-       if ( rc == 0 ) {
-               return meta_back_op_result( lc, op, rs ) == LDAP_SUCCESS
-                       ? 0 : 1;
-       } /* else */
 
+       if ( rc != -1 ) {
+               return meta_back_op_result( mc, op, rs, candidate );
+       }
+       
        send_ldap_result( op, rs );
 
-       return rc;
+       return rs->sr_err;
 }