X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-meta%2Fmodify.c;h=62a041a17f5f6904cadd82482c8782d0a68a5fc0;hb=77a925d7f6936675fca087fce3bb700d7a6fe646;hp=8071a4141c5d1e97fe7b54c0106b503204e098b8;hpb=22f425c1f3481a7fe2e14b6b77cbd4142cf1564b;p=openldap diff --git a/servers/slapd/back-meta/modify.c b/servers/slapd/back-meta/modify.c index 8071a4141c..62a041a17f 100644 --- a/servers/slapd/back-meta/modify.c +++ b/servers/slapd/back-meta/modify.c @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1999-2004 The OpenLDAP Foundation. + * Copyright 1999-2005 The OpenLDAP Foundation. * Portions Copyright 2001-2003 Pierangelo Masarati. * Portions Copyright 1999-2003 Howard Chu. * All rights reserved. @@ -34,35 +34,30 @@ int meta_back_modify( Operation *op, SlapReply *rs ) { - struct metainfo *li = ( struct metainfo * )op->o_bd->be_private; - struct metaconn *lc; - int rc = 0; - LDAPMod **modv = NULL; - LDAPMod *mods = NULL; - Modifications *ml; - int candidate = -1, i; - struct berval mdn = BER_BVNULL; - struct berval mapped; - dncookie dc; - - 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 ) - || !meta_back_is_valid( lc, candidate ) ) { - rs->sr_err = LDAP_OTHER; - rc = -1; - goto cleanup; + metainfo_t *mi = ( metainfo_t * )op->o_bd->be_private; + metaconn_t *mc; + int rc = 0; + LDAPMod **modv = NULL; + LDAPMod *mods = NULL; + Modifications *ml; + int candidate = -1, i; + int isupdate; + struct berval mdn = BER_BVNULL; + struct berval mapped; + dncookie dc; + int do_retry = 1; + + 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; } + assert( mc->mc_conns[ candidate ].msc_ld != NULL ); + /* * Rewrite the modify dn, if needed */ - dc.rwmap = &li->targets[ candidate ]->rwmap; + dc.target = &mi->mi_targets[ candidate ]; dc.conn = op->o_conn; dc.rs = rs; dc.ctx = "modifyDN"; @@ -72,7 +67,7 @@ meta_back_modify( Operation *op, SlapReply *rs ) goto cleanup; } - for ( i = 0, ml = op->oq_modify.rs_modlist; ml; i++ ,ml = ml->sml_next ) + for ( i = 0, ml = op->orm_modlist; ml; i++ ,ml = ml->sml_next ) ; mods = ch_malloc( sizeof( LDAPMod )*i ); @@ -89,18 +84,27 @@ meta_back_modify( Operation *op, SlapReply *rs ) } dc.ctx = "modifyAttrDN"; - for ( i = 0, ml = op->oq_modify.rs_modlist; ml; ml = ml->sml_next ) { - int j; + isupdate = be_shadow_update( op ); + for ( i = 0, ml = op->orm_modlist; ml; ml = ml->sml_next ) { + int j, is_oc = 0; - if ( ml->sml_desc->ad_type->sat_no_user_mod ) { + if ( !isupdate && ml->sml_desc->ad_type->sat_no_user_mod ) { continue; } - ldap_back_map( &li->targets[ candidate ]->rwmap.rwm_at, - &ml->sml_desc->ad_cname, &mapped, - BACKLDAP_MAP ); - if ( mapped.bv_val == NULL || mapped.bv_val[0] == '\0' ) { - 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 ]; @@ -112,18 +116,52 @@ meta_back_modify( Operation *op, SlapReply *rs ) * to allow their use in ACLs at the back-ldap * level. */ - if ( strcmp( ml->sml_desc->ad_type->sat_syntax->ssyn_oid, - SLAPD_DN_SYNTAX ) == 0 ) { - ( void )ldap_dnattr_rewrite( &dc, ml->sml_values ); - } - - if ( ml->sml_values != NULL ){ - for (j = 0; ml->sml_values[ j ].bv_val; j++); - mods[ i ].mod_bvalues = (struct berval **)ch_malloc((j+1) * - sizeof(struct berval *)); - for (j = 0; ml->sml_values[ j ].bv_val; j++) - mods[ i ].mod_bvalues[ j ] = &ml->sml_values[j]; - mods[ i ].mod_bvalues[ j ] = NULL; + if ( ml->sml_values != NULL ) { + 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; + } + } + + 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 ] ); j++ ) { + mods[ i ].mod_bvalues[ j ] = &ml->sml_values[ j ]; + } + mods[ i ].mod_bvalues[ j ] = NULL; + } } else { mods[ i ].mod_bvalues = NULL; @@ -133,27 +171,35 @@ meta_back_modify( Operation *op, SlapReply *rs ) } modv[ i ] = 0; - ldap_modify_s( lc->conns[ candidate ].ld, mdn.bv_val, modv ); +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 ) { free( mdn.bv_val ); + BER_BVZERO( &mdn ); } if ( modv != NULL ) { - for ( i = 0; modv[ i ]; i++) { + for ( i = 0; modv[ i ]; i++ ) { free( modv[ i ]->mod_bvalues ); } } 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; }