X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fmodrdn.c;h=3f542adb4b81e1ed9a561a6fb8470bab5692fe7e;hb=9184d038ead9aeabff5b7c0bb2ed0d1e6bc95c8c;hp=b650ee4a9238d8e14e668763259cf17934d6f39f;hpb=9c3ed0310bc6de304f58f74daf967e6d405a19a5;p=openldap diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c index b650ee4a92..3f542adb4b 100644 --- a/servers/slapd/modrdn.c +++ b/servers/slapd/modrdn.c @@ -1,5 +1,6 @@ +/* $OpenLDAP$ */ /* - * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ /* @@ -34,33 +35,41 @@ #include #include +#include "ldap_pvt.h" #include "slap.h" +#ifdef LDAP_SLAPI +#include "slapi.h" +#endif int do_modrdn( - Connection *conn, - Operation *op + Operation *op, + SlapReply *rs ) { - char *ndn, *newrdn; + struct berval dn = { 0, NULL }; + struct berval newrdn = { 0, NULL }; + struct berval newSuperior = { 0, NULL }; ber_int_t deloldrdn; - Backend *be; - /* Vars for LDAP v3 newSuperior support */ - char *newSuperior = NULL; - char *nnewSuperior = NULL; + + struct berval pnewSuperior = { 0, NULL }; + + struct berval nnewSuperior = { 0, NULL }; + Backend *newSuperior_be = NULL; ber_len_t length; - int rc; + int manageDSAit; +#ifdef LDAP_SLAPI + Slapi_PBlock *pb = op->o_pb; +#endif + +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, ENTRY, "do_modrdn: begin\n", 0, 0, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "do_modrdn\n", 0, 0, 0 ); +#endif - if( op->o_bind_in_progress ) { - Debug( LDAP_DEBUG_ANY, "do_modrdn: SASL bind in progress.\n", - 0, 0, 0 ); - send_ldap_result( conn, op, LDAP_SASL_BIND_IN_PROGRESS, - NULL, "SASL bind in progress", NULL, NULL ); - return LDAP_SASL_BIND_IN_PROGRESS; - } /* * Parse the modrdn request. It looks like this: @@ -73,193 +82,512 @@ do_modrdn( * } */ - if ( ber_scanf( op->o_ber, "{aab", &ndn, &newrdn, &deloldrdn ) - == LBER_ERROR ) { + if ( ber_scanf( op->o_ber, "{mmb", &dn, &newrdn, &deloldrdn ) + == LBER_ERROR ) + { +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, ERR, "do_modrdn: ber_scanf failed\n", 0, 0, 0 ); +#else Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 ); - send_ldap_disconnect( conn, op, - LDAP_PROTOCOL_ERROR, "decoding error" ); - return -1; - } - - if( dn_normalize_case( ndn ) == NULL ) { - Debug( LDAP_DEBUG_ANY, "do_modrdn: invalid dn (%s)\n", ndn, 0, 0 ); - send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL, - "invalid DN", NULL, NULL ); - free( ndn ); - free( newrdn ); - return rc; - } +#endif - if( !rdn_validate( newrdn ) ) { - Debug( LDAP_DEBUG_ANY, "do_modrdn: invalid rdn (%s)\n", newrdn, 0, 0 ); - send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL, - "invalid RDN", NULL, NULL ); - free( ndn ); - free( newrdn ); - return rc; + send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" ); + return SLAPD_DISCONNECT; } /* Check for newSuperior parameter, if present scan it */ if ( ber_peek_tag( op->o_ber, &length ) == LDAP_TAG_NEWSUPERIOR ) { - - if ( op->o_protocol == 0 ) { - /* - * Promote to LDAPv3 - */ - ldap_pvt_thread_mutex_lock( &conn->c_mutex ); - conn->c_protocol = LDAP_VERSION3; - ldap_pvt_thread_mutex_unlock( &conn->c_mutex ); - op->o_protocol = LDAP_VERSION3; - - } else if ( op->o_protocol < LDAP_VERSION3 ) { + if ( op->o_protocol < LDAP_VERSION3 ) { /* Conection record indicates v2 but field * newSuperior is present: report error. */ +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, ERR, + "do_modrdn: (v2) invalid field newSuperior.\n", 0, 0, 0 ); +#else Debug( LDAP_DEBUG_ANY, - "modrdn(v2): invalid field newSuperior!\n", - 0, 0, 0 ); - send_ldap_disconnect( conn, op, + "modrdn(v2): invalid field newSuperior!\n", + 0, 0, 0 ); +#endif + + send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "newSuperior requires LDAPv3" ); - return -1; + rs->sr_err = SLAPD_DISCONNECT; + goto cleanup; } - if ( ber_scanf( op->o_ber, "a", &newSuperior ) + if ( ber_scanf( op->o_ber, "m", &newSuperior ) == LBER_ERROR ) { - Debug( LDAP_DEBUG_ANY, "ber_scanf(\"a\"}) failed\n", - 0, 0, 0 ); - send_ldap_disconnect( conn, op, - LDAP_PROTOCOL_ERROR, "decoding error" ); - return -1; - } - - nnewSuperior = ch_strdup( newSuperior ); +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, ERR, + "do_modrdn: ber_scanf(\"m\") failed\n", 0, 0, 0 ); +#else + Debug( LDAP_DEBUG_ANY, "ber_scanf(\"m\") failed\n", + 0, 0, 0 ); +#endif - if( dn_normalize_case( nnewSuperior ) == NULL ) { - Debug( LDAP_DEBUG_ANY, "do_modrdn: invalid new superior (%s)\n", - newSuperior, 0, 0 ); - send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL, - "invalid (new superior) DN", NULL, NULL ); - free( ndn ); - free( newrdn ); - return rc; + send_ldap_discon( op, rs, + LDAP_PROTOCOL_ERROR, "decoding error" ); + rs->sr_err = SLAPD_DISCONNECT; + goto cleanup; } - + op->orr_newSup = &pnewSuperior; + op->orr_nnewSup = &nnewSuperior; } +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, ARGS, + "do_modrdn: dn (%s) newrdn (%s) newsuperior(%s)\n", + dn.bv_val, newrdn.bv_val, + newSuperior.bv_len ? newSuperior.bv_val : "" ); +#else Debug( LDAP_DEBUG_ARGS, "do_modrdn: dn (%s) newrdn (%s) newsuperior (%s)\n", - ndn, newrdn, - newSuperior != NULL ? newSuperior : "" ); + dn.bv_val, newrdn.bv_val, + newSuperior.bv_len ? newSuperior.bv_val : "" ); +#endif if ( ber_scanf( op->o_ber, /*{*/ "}") == LBER_ERROR ) { - free( ndn ); - free( newrdn ); - free( newSuperior ); - free( nnewSuperior ); +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, ERR, "do_modrdn: ber_scanf failed\n", 0, 0, 0 ); +#else Debug( LDAP_DEBUG_ANY, "do_modrdn: ber_scanf failed\n", 0, 0, 0 ); - send_ldap_disconnect( conn, op, - LDAP_PROTOCOL_ERROR, "decoding error" ); - return -1; +#endif + + send_ldap_discon( op, rs, + LDAP_PROTOCOL_ERROR, "decoding error" ); + rs->sr_err = SLAPD_DISCONNECT; + goto cleanup; } - if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) { - free( ndn ); - free( newrdn ); - free( newSuperior ); + if( get_ctrls( op, rs, 1 ) != LDAP_SUCCESS ) { +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, ERR, "do_modrdn: get_ctrls failed\n", 0, 0, 0 ); +#else Debug( LDAP_DEBUG_ANY, "do_modrdn: get_ctrls failed\n", 0, 0, 0 ); - return rc; +#endif + + /* get_ctrls has sent results. Now clean up. */ + goto cleanup; } - Statslog( LDAP_DEBUG_STATS, "conn=%d op=%d MODRDN dn=\"%s\"\n", - op->o_connid, op->o_opid, ndn, 0, 0 ); + rs->sr_err = dnPrettyNormal( NULL, &dn, &op->o_req_dn, &op->o_req_ndn, op->o_tmpmemctx ); + if( rs->sr_err != LDAP_SUCCESS ) { +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, INFO, + "do_modrdn: conn %d invalid dn (%s)\n", + op->o_connid, dn.bv_val, 0 ); +#else + Debug( LDAP_DEBUG_ANY, + "do_modrdn: invalid dn (%s)\n", dn.bv_val, 0, 0 ); +#endif + send_ldap_error( op, rs, LDAP_INVALID_DN_SYNTAX, "invalid DN" ); + goto cleanup; + } + + if( op->o_req_ndn.bv_len == 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, ERR, + "do_modrdn: attempt to modify root DSE.\n", 0, 0, 0 ); +#else + Debug( LDAP_DEBUG_ANY, "do_modrdn: root dse!\n", 0, 0, 0 ); +#endif + + send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM, + "cannot rename the root DSE" ); + goto cleanup; + + } else if ( bvmatch( &op->o_req_ndn, &global_schemandn ) ) { +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, ERR, + "do_modrdn: attempt to modify subschema subentry: %s (%ld)\n", + global_schemandn.bv_val, (long) global_schemandn.bv_len, 0 ); +#else + Debug( LDAP_DEBUG_ANY, "do_modrdn: subschema subentry: %s (%ld)\n", + global_schemandn.bv_val, (long) global_schemandn.bv_len, 0 ); +#endif + + send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM, + "cannot rename subschema subentry" ); + goto cleanup; + } + + /* FIXME: should have/use rdnPretty / rdnNormalize routines */ + + rs->sr_err = dnPrettyNormal( NULL, &newrdn, &op->orr_newrdn, &op->orr_nnewrdn, op->o_tmpmemctx ); + if( rs->sr_err != LDAP_SUCCESS ) { +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, INFO, + "do_modrdn: conn %d invalid newrdn (%s)\n", + op->o_connid, newrdn.bv_val, 0 ); +#else + Debug( LDAP_DEBUG_ANY, + "do_modrdn: invalid newrdn (%s)\n", newrdn.bv_val, 0, 0 ); +#endif + send_ldap_error( op, rs, LDAP_INVALID_DN_SYNTAX, "invalid new RDN" ); + goto cleanup; + } + + if( rdnValidate( &op->orr_newrdn ) != LDAP_SUCCESS ) { +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, ERR, + "do_modrdn: invalid rdn (%s).\n", op->orr_newrdn.bv_val, 0, 0 ); +#else + Debug( LDAP_DEBUG_ANY, "do_modrdn: invalid rdn (%s)\n", + op->orr_newrdn.bv_val, 0, 0 ); +#endif + + send_ldap_error( op, rs, LDAP_INVALID_DN_SYNTAX, "invalid new RDN" ); + goto cleanup; + } + + if( op->orr_newSup ) { + rs->sr_err = dnPrettyNormal( NULL, &newSuperior, &pnewSuperior, + &nnewSuperior, op->o_tmpmemctx ); + if( rs->sr_err != LDAP_SUCCESS ) { +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, INFO, + "do_modrdn: conn %d invalid newSuperior (%s)\n", + op->o_connid, newSuperior.bv_val, 0 ); +#else + Debug( LDAP_DEBUG_ANY, + "do_modrdn: invalid newSuperior (%s)\n", + newSuperior.bv_val, 0, 0 ); +#endif + send_ldap_error( op, rs, LDAP_INVALID_DN_SYNTAX, "invalid newSuperior" ); + goto cleanup; + } + } + + Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu MODRDN dn=\"%s\"\n", + op->o_connid, op->o_opid, op->o_req_dn.bv_val, 0, 0 ); + + manageDSAit = get_manageDSAit( op ); /* * We could be serving multiple database backends. Select the * appropriate one, or send a referral to our "referral server" * if we don't hold it. */ + if ( (op->o_bd = select_backend( &op->o_req_ndn, manageDSAit, 0 )) == NULL ) { + rs->sr_ref = referral_rewrite( default_referral, + NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT ); + if (!rs->sr_ref) rs->sr_ref = default_referral; + + if ( rs->sr_ref != NULL ) { + rs->sr_err = LDAP_REFERRAL; + send_ldap_result( op, rs ); - if ( (be = select_backend( ndn )) == NULL ) { - free( ndn ); - free( newrdn ); - free( newSuperior ); - free( nnewSuperior ); - send_ldap_result( conn, op, rc = LDAP_REFERRAL, - NULL, NULL, default_referral, NULL ); - return rc; + if (rs->sr_ref != default_referral) ber_bvarray_free( rs->sr_ref ); + } else { + send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM, + "referral missing" ); + } + goto cleanup; + } + + /* check restrictions */ + if( backend_check_restrictions( op, rs, NULL ) != LDAP_SUCCESS ) { + send_ldap_result( op, rs ); + goto cleanup; + } + + /* check for referrals */ + if ( backend_check_referrals( op, rs ) != LDAP_SUCCESS ) { + goto cleanup; } /* Make sure that the entry being changed and the newSuperior are in * the same backend, otherwise we return an error. */ - if( newSuperior != NULL ) { - newSuperior_be = select_backend( nnewSuperior ); - - if ( newSuperior_be != be ) { - /* newSuperior is in same backend */ - rc = LDAP_AFFECTS_MULTIPLE_DSAS; - - send_ldap_result( conn, op, rc, - NULL, NULL, NULL, NULL ); + if( op->orr_newSup ) { + newSuperior_be = select_backend( &nnewSuperior, 0, 0 ); - free( ndn ); - free( newrdn ); - free( newSuperior ); - free( nnewSuperior ); + if ( newSuperior_be != op->o_bd ) { + /* newSuperior is in different backend */ + send_ldap_error( op, rs, LDAP_AFFECTS_MULTIPLE_DSAS, + "cannot rename between DSAs" ); - return rc; + goto cleanup; } - - /* deref suffix alias if appropriate */ - nnewSuperior = suffix_alias( be, nnewSuperior ); } - /* deref suffix alias if appropriate */ - ndn = suffix_alias( be, ndn ); +#if defined( LDAP_SLAPI ) + slapi_x_pblock_set_operation( pb, op ); + slapi_pblock_set( pb, SLAPI_MODRDN_TARGET, (void *)dn.bv_val ); + slapi_pblock_set( pb, SLAPI_MODRDN_NEWRDN, (void *)newrdn.bv_val ); + slapi_pblock_set( pb, SLAPI_MODRDN_NEWSUPERIOR, + (void *)newSuperior.bv_val ); + slapi_pblock_set( pb, SLAPI_MODRDN_DELOLDRDN, (void *)deloldrdn ); + slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)manageDSAit ); + + rs->sr_err = doPluginFNs( op->o_bd, SLAPI_PLUGIN_PRE_MODRDN_FN, pb ); + if ( rs->sr_err < 0 ) { + /* + * A preoperation plugin failure will abort the + * entire operation. + */ +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, INFO, "do_modrdn: modrdn preoperation plugin " + "failed\n", 0, 0, 0 ); +#else + Debug(LDAP_DEBUG_TRACE, "do_modrdn: modrdn preoperation plugin " + "failed.\n", 0, 0, 0); +#endif + if ( ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&rs->sr_err ) != 0 ) || + rs->sr_err == LDAP_SUCCESS ) { + rs->sr_err = LDAP_OTHER; + } + goto cleanup; + } +#endif /* defined( LDAP_SLAPI ) */ /* - * do the add if 1 && (2 || 3) - * 1) there is an add function implemented in this backend; + * do the modrdn if 1 && (2 || 3) + * 1) there is a modrdn function implemented in this backend; * 2) this backend is master for what it holds; * 3) it's a replica and the dn supplied is the update_ndn. */ - if ( be->be_modrdn ) { + if ( op->o_bd->be_modrdn ) { /* do the update here */ -#ifndef SLAPD_MULTIMASTER - if ( be->be_update_ndn == NULL || - strcmp( be->be_update_ndn, op->o_ndn ) == 0 ) + int repl_user = be_isupdate( op->o_bd, &op->o_ndn ); +#if defined(LDAP_SYNCREPL) && !defined(SLAPD_MULTIMASTER) + if ( !op->o_bd->syncinfo && + ( !op->o_bd->be_update_ndn.bv_len || repl_user )) +#elif defined(LDAP_SYNCREPL) && defined(SLAPD_MULTIMASTER) + if ( !op->o_bd->syncinfo ) /* LDAP_SYNCREPL overrides MM */ +#elif !defined(LDAP_SYNCREPL) && !defined(SLAPD_MULTIMASTER) + if ( !op->o_bd->be_update_ndn.bv_len || repl_user ) #endif { - if ( (*be->be_modrdn)( be, conn, op, ndn, newrdn, - deloldrdn, newSuperior ) == 0 + op->orr_deleteoldrdn = deloldrdn; + if ( (op->o_bd->be_modrdn)( op, rs ) == 0 #ifdef SLAPD_MULTIMASTER - && ( be->be_update_ndn == NULL || - strcmp( be->be_update_ndn, op->o_ndn ) ) + && ( !op->o_bd->be_update_ndn.bv_len || !repl_user ) #endif ) { - struct replog_moddn moddn; - moddn.newrdn = newrdn; - moddn.deloldrdn = deloldrdn; - moddn.newsup = newSuperior; - - replog( be, op, ndn, &moddn ); + replog( op ); } -#ifndef SLAPD_MULTIMASTER +#if defined(LDAP_SYNCREPL) || !defined(SLAPD_MULTIMASTER) } else { - send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL, - be->be_update_refs ? be->be_update_refs : default_referral, NULL ); + BerVarray defref = NULL; +#ifdef LDAP_SYNCREPL + if ( op->o_bd->syncinfo ) { + defref = op->o_bd->syncinfo->master_bv; + } else +#endif + { + defref = op->o_bd->be_update_refs + ? op->o_bd->be_update_refs : default_referral; + } + if ( defref != NULL ) { + rs->sr_ref = referral_rewrite( defref, + NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT ); + if (!rs->sr_ref) rs->sr_ref = defref; + + rs->sr_err = LDAP_REFERRAL; + send_ldap_result( op, rs ); + + if (rs->sr_ref != defref) ber_bvarray_free( rs->sr_ref ); + } else { + send_ldap_error( op, rs, + LDAP_UNWILLING_TO_PERFORM, + "referral missing" ); + } #endif } } else { - send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM, - NULL, "Function not implemented", NULL, NULL ); + send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM, + "operation not supported within namingContext" ); } - free( ndn ); - free( newrdn ); - free( newSuperior ); - free( nnewSuperior ); - return rc; +#if defined( LDAP_SLAPI ) + if ( doPluginFNs( op->o_bd, SLAPI_PLUGIN_POST_MODRDN_FN, pb ) < 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, INFO, "do_modrdn: modrdn postoperation plugins " + "failed\n", 0, 0, 0 ); +#else + Debug(LDAP_DEBUG_TRACE, "do_modrdn: modrdn postoperation plugins " + "failed.\n", 0, 0, 0); +#endif + } +#endif /* defined( LDAP_SLAPI ) */ + +cleanup: + op->o_tmpfree( op->o_req_dn.bv_val, op->o_tmpmemctx ); + op->o_tmpfree( op->o_req_ndn.bv_val, op->o_tmpmemctx ); + + op->o_tmpfree( op->orr_newrdn.bv_val, op->o_tmpmemctx ); + op->o_tmpfree( op->orr_nnewrdn.bv_val, op->o_tmpmemctx ); + + if ( pnewSuperior.bv_val ) op->o_tmpfree( pnewSuperior.bv_val, op->o_tmpmemctx ); + if ( nnewSuperior.bv_val ) op->o_tmpfree( nnewSuperior.bv_val, op->o_tmpmemctx ); + + return rs->sr_err; +} + +int +slap_modrdn2mods( + Operation *op, + SlapReply *rs, + Entry *e, + LDAPRDN old_rdn, + LDAPRDN new_rdn, + Modifications **pmod ) +{ + Modifications *mod = NULL; + int a_cnt, d_cnt; + + assert( new_rdn != NULL ); + assert( !op->orr_deleteoldrdn || old_rdn != NULL ); + + /* Add new attribute values to the entry */ + for ( a_cnt = 0; new_rdn[a_cnt]; a_cnt++ ) { + AttributeDescription *desc = NULL; + Modifications *mod_tmp; + + rs->sr_err = slap_bv2ad( &new_rdn[a_cnt]->la_attr, &desc, &rs->sr_text ); + + if ( rs->sr_err != LDAP_SUCCESS ) { +#ifdef NEW_LOGGING + LDAP_LOG ( OPERATION, ERR, + "slap_modrdn2modlist: %s: %s (new)\n", + rs->sr_text, + new_rdn[ a_cnt ]->la_attr.bv_val, 0 ); +#else + Debug( LDAP_DEBUG_TRACE, + "slap_modrdn2modlist: %s: %s (new)\n", + rs->sr_text, + new_rdn[ a_cnt ]->la_attr.bv_val, 0 ); +#endif + goto done; + } + + /* ACL check of newly added attrs */ + if ( op->o_bd && !access_allowed( op, e, desc, + &new_rdn[a_cnt]->la_value, ACL_WRITE, NULL ) ) { +#ifdef NEW_LOGGING + LDAP_LOG ( OPERATION, ERR, + "slap_modrdn2modlist: access to attr \"%s\" " + "(new) not allowed\n", + new_rdn[a_cnt]->la_attr.bv_val, 0, 0 ); +#else + Debug( LDAP_DEBUG_TRACE, + "slap_modrdn2modlist: access to attr \"%s\" " + "(new) not allowed\n", + new_rdn[ a_cnt ]->la_attr.bv_val, 0, 0 ); +#endif + rs->sr_err = LDAP_INSUFFICIENT_ACCESS; + goto done; + } + + /* Apply modification */ + mod_tmp = ( Modifications * )ch_malloc( sizeof( Modifications ) + + 4 * sizeof( struct berval ) ); + mod_tmp->sml_desc = desc; + mod_tmp->sml_values = ( BerVarray )( mod_tmp + 1 ); + mod_tmp->sml_values[0] = new_rdn[a_cnt]->la_value; + mod_tmp->sml_values[1].bv_val = NULL; + if( desc->ad_type->sat_equality->smr_normalize) { + mod_tmp->sml_nvalues = &mod_tmp->sml_values[2]; + (void) (*desc->ad_type->sat_equality->smr_normalize)( + SLAP_MR_EQUALITY, + desc->ad_type->sat_syntax, + desc->ad_type->sat_equality, + &mod_tmp->sml_values[0], + &mod_tmp->sml_nvalues[0], op->o_tmpmemctx ); + mod_tmp->sml_nvalues[1].bv_val = NULL; + } else { + mod_tmp->sml_nvalues = NULL; + } + mod_tmp->sml_op = SLAP_MOD_SOFTADD; + mod_tmp->sml_next = mod; + mod = mod_tmp; + } + + /* Remove old rdn value if required */ + if ( op->orr_deleteoldrdn ) { + for ( d_cnt = 0; old_rdn[d_cnt]; d_cnt++ ) { + AttributeDescription *desc = NULL; + Modifications *mod_tmp; + + rs->sr_err = slap_bv2ad( &old_rdn[d_cnt]->la_attr, &desc, &rs->sr_text ); + if ( rs->sr_err != LDAP_SUCCESS ) { +#ifdef NEW_LOGGING + LDAP_LOG ( OPERATION, ERR, + "slap_modrdn2modlist: %s: %s (old)\n", + rs->sr_text, + old_rdn[d_cnt]->la_attr.bv_val, + 0 ); +#else + Debug( LDAP_DEBUG_TRACE, + "slap_modrdn2modlist: %s: %s (old)\n", + rs->sr_text, + old_rdn[d_cnt]->la_attr.bv_val, + 0 ); +#endif + goto done; + } + + /* ACL check of newly added attrs */ + if ( op->o_bd && !access_allowed( op, e, desc, + &old_rdn[d_cnt]->la_value, ACL_WRITE, + NULL ) ) { +#ifdef NEW_LOGGING + LDAP_LOG ( OPERATION, ERR, + "slap_modrdn2modlist: access " + "to attr \"%s\" (old) not allowed\n", + old_rdn[ d_cnt ]->la_attr.bv_val, + 0, 0 ); +#else + Debug( LDAP_DEBUG_TRACE, + "slap_modrdn2modlist: access " + "to attr \"%s\" (old) not allowed\n", + old_rdn[ d_cnt ]->la_attr.bv_val, + 0, 0 ); +#endif + rs->sr_err = LDAP_INSUFFICIENT_ACCESS; + goto done; + } + + /* Apply modification */ + mod_tmp = ( Modifications * )ch_malloc( sizeof( Modifications ) + + 4 * sizeof ( struct berval ) ); + mod_tmp->sml_desc = desc; + mod_tmp->sml_values = ( BerVarray )(mod_tmp+1); + mod_tmp->sml_values[0] = old_rdn[d_cnt]->la_value; + mod_tmp->sml_values[1].bv_val = NULL; + if( desc->ad_type->sat_equality->smr_normalize) { + mod_tmp->sml_nvalues = &mod_tmp->sml_values[2]; + (void) (*desc->ad_type->sat_equality->smr_normalize)( + SLAP_MR_EQUALITY, + desc->ad_type->sat_syntax, + desc->ad_type->sat_equality, + &mod_tmp->sml_values[0], + &mod_tmp->sml_nvalues[0], op->o_tmpmemctx ); + mod_tmp->sml_nvalues[1].bv_val = NULL; + } else { + mod_tmp->sml_nvalues = NULL; + } + mod_tmp->sml_op = LDAP_MOD_DELETE; + mod_tmp->sml_next = mod; + mod = mod_tmp; + } + } + +done: + /* LDAP v2 supporting correct attribute handling. */ + if ( rs->sr_err != LDAP_SUCCESS && mod != NULL ) { + Modifications *tmp; + for ( ; mod; mod = tmp ) { + tmp = mod->sml_next; + ch_free( mod ); + } + } + + *pmod = mod; + + return rs->sr_err; }