/* get entry with writer lock */
if ( (e = dn2entry_w( be, ndn, &matched )) == NULL ) {
char* matched_dn = NULL;
- BVarray refs;
+ BerVarray refs;
if( matched != NULL ) {
matched_dn = strdup( matched->e_dn );
send_ldap_result( conn, op, LDAP_REFERRAL,
matched_dn, NULL, refs, NULL );
- if ( refs ) bvarray_free( 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 */
- BVarray 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 );
- if ( refs ) bvarray_free( refs );
+ if ( refs ) ber_bvarray_free( refs );
goto return_results;
}
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 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, &(char *)text,
+ if ( ldap_str2rdn( newrdn->bv_val, &new_rdn, (char **)&text,
LDAP_DN_FORMAT_LDAP ) )
{
#ifdef NEW_LOGGING
#endif
/* Retrieve the old rdn from the entry's dn */
- if ( ldap_str2rdn( dn->bv_val, &old_rdn, &(char *)text,
+ if ( ldap_str2rdn( dn->bv_val, &old_rdn, (char **)&text,
LDAP_DN_FORMAT_LDAP ) )
{
#ifdef NEW_LOGGING
mod_tmp = (Modifications *)ch_malloc( sizeof( Modifications )
+ 2 * sizeof( struct berval ) );
mod_tmp->sml_desc = desc;
- mod_tmp->sml_bvalues = (BVarray)( mod_tmp + 1 );
+ 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 = (Modifications *)ch_malloc( sizeof( Modifications )
+ 2 * sizeof( struct berval ) );
mod_tmp->sml_desc = desc;
- mod_tmp->sml_bvalues = (BVarray)(mod_tmp+1);
+ 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;