/* modrdn.c - ldbm backend modrdn routine */
/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
#endif
/* get entry with writer lock */
- if ( (e = dn2entry_w( be, ndn->bv_val, &matched )) == NULL ) {
+ if ( (e = dn2entry_w( be, ndn, &matched )) == NULL ) {
char* matched_dn = NULL;
- struct berval** refs;
+ BerVarray refs;
if( matched != NULL ) {
matched_dn = strdup( matched->e_dn );
send_ldap_result( conn, op, LDAP_REFERRAL,
matched_dn, NULL, refs, NULL );
- ber_bvecfree( refs );
+ if ( refs ) ber_bvarray_free( refs );
free( matched_dn );
return( -1 );
if (!manageDSAit && is_entry_referral( e ) ) {
/* parent is a referral, don't allow add */
/* parent is an alias, don't allow add */
- struct berval **refs = get_entry_referrals( be,
+ BerVarray refs = get_entry_referrals( be,
conn, op, e );
#ifdef NEW_LOGGING
send_ldap_result( conn, op, LDAP_REFERRAL,
e->e_dn, NULL, refs, NULL );
- ber_bvecfree( refs );
+ if ( refs ) ber_bvarray_free( refs );
goto return_results;
}
goto return_results;
}
- p_ndn.bv_val = dn_parent( be, e->e_ndn );
- if ( p_ndn.bv_val )
- p_ndn.bv_len = e->e_nname.bv_len - (p_ndn.bv_val - e->e_ndn);
- else
- p_ndn.bv_len = 0;
+ if ( be_issuffix( be, &e->e_nname ) ) {
+ p_ndn = slap_empty_bv ;
+ } else {
+ dnParent( &e->e_nname, &p_ndn );
+ }
if ( p_ndn.bv_len != 0 ) {
/* Make sure parent entry exist and we can write its
* children.
*/
- if( (p = dn2entry_w( be, p_ndn.bv_val, NULL )) == NULL) {
+ if( (p = dn2entry_w( be, &p_ndn, NULL )) == NULL) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_modrdn: parent of %s does not exist\n", e->e_ndn ));
p_ndn.bv_val, 0, 0 );
#endif
- p_dn.bv_val = dn_parent( be, e->e_dn );
- if ( p_dn.bv_val )
- p_dn.bv_len = e->e_name.bv_len - (p_dn.bv_val - e->e_dn);
- else
- p_dn.bv_len = 0;
+ if ( p_ndn.bv_val == slap_empty_bv.bv_val ) {
+ p_dn = slap_empty_bv;
+ } else {
+ dnParent( &e->e_name, &p_dn );
+ }
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
/* no parent, must be root to modify rdn */
isroot = be_isroot( be, &op->o_ndn );
if ( ! isroot ) {
- if ( be_issuffix( be, "" ) || be_isupdate( be, &op->o_ndn ) ) {
+ if ( be_issuffix( be, (struct berval *)&slap_empty_bv ) || be_isupdate( be, &op->o_ndn ) ) {
p = (Entry *)&slap_entry_root;
rc = access_allowed( be, conn, op, p,
np_ndn = nnewSuperior;
/* newSuperior == oldParent? */
- if ( p_ndn.bv_len == np_ndn->bv_len &&
- strcmp( p_ndn.bv_val, np_ndn->bv_val ) == 0 ) {
+ if ( dn_match( &p_ndn, np_ndn ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO, "ldbm_back_modrdn: "
"new parent\"%s\" seems to be the same as the "
/* Get Entry with dn=newSuperior. Does newSuperior exist? */
if ( nnewSuperior->bv_len ) {
- if( (np = dn2entry_w( be, np_ndn->bv_val, NULL )) == NULL) {
+ if( (np = dn2entry_w( be, np_ndn, NULL )) == NULL) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
"ldbm_back_modrdn: newSup(ndn=%s) not found.\n", np_ndn->bv_val ));
}
if ( ! isroot ) {
- if ( be_issuffix( be, "" ) || be_isupdate( be, &op->o_ndn ) ) {
+ if ( be_issuffix( be, (struct berval *)&slap_empty_bv ) || be_isupdate( be, &op->o_ndn ) ) {
np = (Entry *)&slap_entry_root;
rc = access_allowed( be, conn, op, np,
}
ldap_pvt_thread_mutex_unlock( &op->o_abandonmutex );
- if ( ( rc_id = dn2id ( be, new_ndn.bv_val, &id ) ) || id != NOID ) {
+ if ( ( rc_id = dn2id ( be, &new_ndn, &id ) ) || id != NOID ) {
/* if (rc_id) something bad happened to ldbm cache */
send_ldap_result( conn, op,
rc_id ? LDAP_OPERATIONS_ERROR : LDAP_ALREADY_EXISTS,
/* Get attribute types and values of our new rdn, we will
* need to add that to our new entry
*/
- if ( ldap_str2rdn( newrdn->bv_val, &new_rdn, &text, LDAP_DN_FORMAT_LDAP ) ) {
+ if ( ldap_str2rdn( newrdn->bv_val, &new_rdn, (char **)&text,
+ LDAP_DN_FORMAT_LDAP ) )
+ {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_modrdn: can't figure out type(s)/value(s) of newrdn\n" ));
#endif
/* Retrieve the old rdn from the entry's dn */
- if ( ldap_str2rdn( dn->bv_val, &old_rdn, &text, LDAP_DN_FORMAT_LDAP ) ) {
+ if ( ldap_str2rdn( dn->bv_val, &old_rdn, (char **)&text,
+ LDAP_DN_FORMAT_LDAP ) )
+ {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_modrdn: can't figure out the old_rdn type(s)/value(s).\n" ));
}
mod_tmp = (Modifications *)ch_malloc( sizeof( Modifications )
- + 2 * sizeof( struct berval * ) );
+ + 2 * sizeof( struct berval ) );
mod_tmp->sml_desc = desc;
- mod_tmp->sml_bvalues = (struct berval **)( mod_tmp + 1 );
- mod_tmp->sml_bvalues[0] = &new_rdn[0][a_cnt]->la_value;
- mod_tmp->sml_bvalues[1] = NULL;
+ mod_tmp->sml_bvalues = (BerVarray)( mod_tmp + 1 );
+ mod_tmp->sml_bvalues[0] = new_rdn[0][a_cnt]->la_value;
+ mod_tmp->sml_bvalues[1].bv_val = NULL;
mod_tmp->sml_op = SLAP_MOD_SOFTADD;
mod_tmp->sml_next = mod;
mod = mod_tmp;
/* Remove old value of rdn as an attribute. */
mod_tmp = (Modifications *)ch_malloc( sizeof( Modifications )
- + 2 * sizeof( struct berval * ) );
+ + 2 * sizeof( struct berval ) );
mod_tmp->sml_desc = desc;
- mod_tmp->sml_bvalues = (struct berval **)(mod_tmp+1);
- mod_tmp->sml_bvalues[0] = &old_rdn[0][d_cnt]->la_value;
- mod_tmp->sml_bvalues[1] = NULL;
+ mod_tmp->sml_bvalues = (BerVarray)(mod_tmp+1);
+ mod_tmp->sml_bvalues[0] = old_rdn[0][d_cnt]->la_value;
+ mod_tmp->sml_bvalues[1].bv_val = NULL;
mod_tmp->sml_op = LDAP_MOD_DELETE;
mod_tmp->sml_next = mod;
mod = mod_tmp;
ldap_pvt_thread_mutex_unlock( &op->o_abandonmutex );
/* delete old one */
- if ( dn2id_delete( be, e->e_ndn, e->e_id ) != 0 ) {
+ if ( dn2id_delete( be, &e->e_nname, e->e_id ) != 0 ) {
send_ldap_result( conn, op, LDAP_OTHER,
NULL, "DN index delete fail", NULL, NULL );
goto return_results;
new_ndn.bv_val = NULL;
/* add new one */
- if ( dn2id_add( be, e->e_ndn, e->e_id ) != 0 ) {
+ if ( dn2id_add( be, &e->e_nname, e->e_id ) != 0 ) {
send_ldap_result( conn, op, LDAP_OTHER,
NULL, "DN index add failed", NULL, NULL );
goto return_results;
}
/* here we may try to delete the newly added dn */
- if ( dn2id_delete( be, e->e_ndn, e->e_id ) != 0 ) {
+ if ( dn2id_delete( be, &e->e_nname, e->e_id ) != 0 ) {
/* we already are in trouble ... */
;
}