/* modrdn.c - bdb 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
*/
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
AttributeDescription *children = slap_schema.si_ad_children;
struct berval p_dn, p_ndn;
- struct berval new_dn = {0, NULL}, *new_ndn = NULL;
+ struct berval new_dn = {0, NULL}, new_ndn = {0, NULL};
int isroot = -1;
Entry *e, *p = NULL;
Entry *matched;
struct bdb_op_info opinfo;
ID id;
- char **new_rdn_vals = NULL; /* Vals of new rdn */
- char **new_rdn_types = NULL; /* Types of new rdn */
int a_cnt, d_cnt;
- char *old_rdn = NULL; /* Old rdn's attr type & val */
- char **old_rdn_types = NULL; /* Types of old rdn attr. */
- char **old_rdn_vals = NULL; /* Old rdn attribute values */
+ LDAPRDN *new_rdn = NULL;
+ LDAPRDN *old_rdn = NULL;
Entry *np = NULL; /* newSuperior Entry */
struct berval *np_dn = NULL; /* newSuperior dn */
text = "internal error";
goto return_results;
}
+ ldap_pvt_thread_yield();
}
if( bdb->bi_txn ) {
if ( e == NULL ) {
char* matched_dn = NULL;
- struct berval** refs;
+ BerVarray refs;
if( matched != NULL ) {
matched_dn = strdup( matched->e_dn );
send_ldap_result( conn, op, rc = LDAP_REFERRAL,
matched_dn, NULL, refs, NULL );
- ber_bvecfree( refs );
+ ber_bvarray_free( refs );
free( matched_dn );
goto done;
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 );
Debug( LDAP_DEBUG_TRACE, "bdb_modrdn: entry %s is referral\n",
send_ldap_result( conn, op, rc = LDAP_REFERRAL,
e->e_dn, NULL, refs, NULL );
- ber_bvecfree( refs );
+ ber_bvarray_free( refs );
goto done;
}
- 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
+ if ( be_issuffix( be, e->e_nname.bv_val ) ) {
p_ndn.bv_len = 0;
+ p_ndn.bv_val = "";
+ } else {
+ rc = dnParent( e->e_nname.bv_val, (const char **)&p_ndn.bv_val );
+ if ( rc != LDAP_SUCCESS ) {
+ text = "internal error";
+ goto return_results;
+ }
+ p_ndn.bv_len = e->e_nname.bv_len - (p_ndn.bv_val - e->e_nname.bv_val);
+ }
np_ndn = &p_ndn;
if ( p_ndn.bv_len != 0 ) {
/* Make sure parent entry exist and we can write its
"bdb_modrdn: wr to children of entry %s OK\n",
p_ndn.bv_val, 0, 0 );
- 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
+ if ( be_issuffix( be, e->e_name.bv_val ) ) {
p_dn.bv_len = 0;
+ p_dn.bv_val = "";
+ } else {
+ rc = dnParent( e->e_name.bv_val, &p_dn.bv_val );
+ if ( rc != LDAP_SUCCESS ) {
+ text = "internal error";
+ goto return_results;
+ }
+ p_dn.bv_len = e->e_name.bv_len - (p_dn.bv_val - e->e_name.bv_val);
+ }
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: parent dn=%s\n",
/* Build target dn and make sure target entry doesn't exist already. */
build_new_dn( &new_dn, new_parent_dn, newrdn );
- dnNormalize( NULL, &new_dn, &new_ndn );
+ dnNormalize2( NULL, &new_dn, &new_ndn );
Debug( LDAP_DEBUG_TRACE, "bdb_modrdn: new ndn=%s\n",
- new_ndn, 0, 0 );
+ new_ndn.bv_val, 0, 0 );
- rc = bdb_dn2id ( be, ltid, new_ndn, &id );
+ rc = bdb_dn2id ( be, ltid, &new_ndn, &id );
switch( rc ) {
case DB_LOCK_DEADLOCK:
case DB_LOCK_NOTGRANTED:
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: new ndn=%s does not exist\n",
- new_ndn, 0, 0 );
+ new_ndn.bv_val, 0, 0 );
/* Get attribute type and attribute value of our new rdn, we will
* need to add that to our new entry
*/
-
- if ( rdn_attrs( newrdn->bv_val, &new_rdn_types, &new_rdn_vals ) ) {
+ if ( ldap_str2rdn( newrdn->bv_val, &new_rdn, (char **)&text,
+ LDAP_DN_FORMAT_LDAP ) )
+ {
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: can't figure out type(s)/values(s) "
"of newrdn\n", 0, 0, 0 );
}
Debug( LDAP_DEBUG_TRACE,
- "bdb_modrdn: new_rdn_val=\"%s\", new_rdn_type=\"%s\"\n",
- new_rdn_vals[0], new_rdn_types[0], 0 );
-
- /* Retrieve the old rdn from the entry's dn */
- if ( ( old_rdn = dn_rdn( be, dn->bv_val ) ) == NULL ) {
- Debug( LDAP_DEBUG_TRACE,
- "bdb_modrdn: can't figure out old_rdn from dn\n",
- 0, 0, 0 );
- rc = LDAP_OTHER;
- text = "could not parse old DN";
- goto return_results;
- }
+ "bdb_modrdn: new_rdn_type=\"%s\", new_rdn_val=\"%s\"\n",
+ new_rdn[0][0]->la_attr.bv_val, new_rdn[0][0]->la_value.bv_val, 0 );
- if ( rdn_attrs( old_rdn, &old_rdn_types, &old_rdn_vals ) ) {
+ if ( ldap_str2rdn( dn->bv_val, &old_rdn, (char **)&text,
+ LDAP_DN_FORMAT_LDAP ) )
+ {
Debug( LDAP_DEBUG_TRACE,
"bdb_back_modrdn: can't figure out the old_rdn "
"type(s)/value(s)\n", 0, 0, 0 );
text = "cannot parse RDN from old DN";
goto return_results;
}
-
+
+#if 0
if ( newSuperior == NULL
&& charray_strcasecmp( ( const char ** )old_rdn_types,
( const char ** )new_rdn_types ) != 0 ) {
"do not match\n",
old_rdn_types[ 0 ], new_rdn_types[ 0 ], 0 );
}
+#endif
/* Add new attribute values to the entry */
- for ( a_cnt = 0; new_rdn_types[ a_cnt ]; a_cnt++ ) {
+ for ( a_cnt = 0; new_rdn[0][ a_cnt ]; a_cnt++ ) {
int rc;
AttributeDescription *desc = NULL;
Modifications *mod_tmp;
- struct berval val;
- rc = slap_str2ad( new_rdn_types[ a_cnt ], &desc, &text );
+ rc = slap_bv2ad( &new_rdn[0][ a_cnt ]->la_attr, &desc, &text );
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: %s: %s (new)\n",
- text, new_rdn_types[ a_cnt ], 0 );
+ text, new_rdn[0][ a_cnt ]->la_attr.bv_val, 0 );
goto return_results;
}
/* ACL check of newly added attrs */
- val.bv_val = new_rdn_vals[ a_cnt ];
- val.bv_len = strlen( val.bv_val );
- if ( !access_allowed( be, conn, op, e,
- desc, &val, ACL_WRITE ) ) {
+ if ( !access_allowed( be, conn, op, e, desc,
+ &new_rdn[0][ a_cnt ]->la_value, ACL_WRITE ) ) {
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: access to attr \"%s\" "
"(new) not allowed\n",
- new_rdn_types[ a_cnt ], 0, 0 );
+ new_rdn[0][ a_cnt ]->la_attr.bv_val, 0, 0 );
rc = LDAP_INSUFFICIENT_ACCESS;
goto return_results;
}
/* Apply modification */
- mod_tmp = ( Modifications * )ch_malloc( sizeof( Modifications ) );
+ mod_tmp = ( Modifications * )ch_malloc( sizeof( Modifications )
+ + 2 * sizeof( struct berval ) );
mod_tmp->sml_desc = desc;
- mod_tmp->sml_bvalues = ( struct berval ** )ch_malloc( 2*sizeof( struct berval * ) );
- mod_tmp->sml_bvalues[ 0 ] = ber_bvstrdup( new_rdn_vals[ a_cnt ] );
- 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 rdn value if required */
if ( deleteoldrdn ) {
/* Get value of old rdn */
- if ( old_rdn_vals == NULL) {
+ if ( old_rdn == NULL) {
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: can't figure out old RDN value(s) "
"from old RDN\n", 0, 0, 0 );
goto return_results;
}
- for ( d_cnt = 0; old_rdn_types[ d_cnt ]; d_cnt++ ) {
+ for ( d_cnt = 0; old_rdn[0][ d_cnt ]; d_cnt++ ) {
int rc;
AttributeDescription *desc = NULL;
Modifications *mod_tmp;
- struct berval val;
- rc = slap_str2ad( old_rdn_types[ d_cnt ],
+ rc = slap_bv2ad( &old_rdn[0][ d_cnt ]->la_attr,
&desc, &text );
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: %s: %s (old)\n",
- text, old_rdn_types[ d_cnt ], 0 );
+ text, old_rdn[0][ d_cnt ]->la_attr.bv_val, 0 );
goto return_results;
}
/* ACL check of newly added attrs */
- val.bv_val = new_rdn_vals[ d_cnt ];
- val.bv_len = strlen( val.bv_val );
- if ( !access_allowed( be, conn, op, e,
- desc, &val, ACL_WRITE ) ) {
+ if ( !access_allowed( be, conn, op, e, desc,
+ &old_rdn[0][d_cnt]->la_value, ACL_WRITE ) ) {
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: access to attr \"%s\" "
"(old) not allowed\n",
- old_rdn_types[ d_cnt ], 0, 0 );
+ old_rdn[0][ d_cnt ]->la_attr.bv_val, 0, 0 );
rc = LDAP_INSUFFICIENT_ACCESS;
goto return_results;
}
/* Apply modification */
- mod_tmp = ( Modifications * )ch_malloc( sizeof( Modifications ) );
+ mod_tmp = ( Modifications * )ch_malloc( sizeof( Modifications )
+ + 2 * sizeof ( struct berval ) );
mod_tmp->sml_desc = desc;
- mod_tmp->sml_bvalues = ( struct berval ** )ch_malloc( 2*sizeof( struct berval * ) );
- mod_tmp->sml_bvalues[ 0 ] = ber_bvstrdup( old_rdn_vals[ d_cnt ] );
- 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;
* they can be individually freed later.
*/
e->e_name = new_dn;
- e->e_nname = *new_ndn;
+ e->e_nname = new_ndn;
/* add new one */
rc = bdb_dn2id_add( be, ltid, np_ndn, e );
done:
if( new_dn.bv_val != NULL ) free( new_dn.bv_val );
- if( new_ndn != NULL ) ber_bvfree( new_ndn );
+ if( new_ndn.bv_val != NULL ) free( new_ndn.bv_val );
/* LDAP v2 supporting correct attribute handling. */
- if( new_rdn_types != NULL ) charray_free(new_rdn_types);
- if( new_rdn_vals != NULL ) charray_free(new_rdn_vals);
- if( old_rdn != NULL ) free(old_rdn);
- if( old_rdn_types != NULL ) charray_free(old_rdn_types);
- if( old_rdn_vals != NULL ) charray_free(old_rdn_vals);
- if( mod != NULL ) slap_mods_free(mod);
+ if( new_rdn != NULL ) ldap_rdnfree( new_rdn );
+ if( old_rdn != NULL ) ldap_rdnfree( old_rdn );
+ if( mod != NULL ) {
+ Modifications *tmp;
+ for (; mod; mod=tmp ) {
+ tmp = mod->sml_next;
+ free( mod );
+ }
+ }
/* LDAP v3 Support */
if( np != NULL ) {
projects / openldap / blobdiff