/* 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
*/
int
bdb_modrdn(
- Backend *be,
- Connection *conn,
- Operation *op,
- struct berval *dn,
- struct berval *ndn,
- struct berval *newrdn,
- struct berval *nnewrdn,
- int deleteoldrdn,
- struct berval *newSuperior,
- struct berval *nnewSuperior
-)
+ Backend *be,
+ Connection *conn,
+ Operation *op,
+ struct berval *dn,
+ struct berval *ndn,
+ struct berval *newrdn,
+ struct berval *nnewrdn,
+ int deleteoldrdn,
+ struct berval *newSuperior,
+ struct berval *nnewSuperior )
{
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
AttributeDescription *children = slap_schema.si_ad_children;
- char *p_dn = NULL, *p_ndn = NULL;
- char *new_dn = NULL, *new_ndn = NULL;
+ struct berval p_dn, p_ndn;
+ struct berval new_dn = {0, NULL}, new_ndn = {0, NULL};
int isroot = -1;
- Entry *e, *p = NULL;
+ Entry *e = NULL;
+ Entry *p = NULL;
Entry *matched;
int rc;
const char *text;
DB_TXN * ltid = NULL;
struct bdb_op_info opinfo;
- struct berval bv;
-
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 */
- char *np_dn = NULL; /* newSuperior dn */
- char *np_ndn = NULL; /* newSuperior ndn */
- char *new_parent_dn = NULL; /* np_dn, p_dn, or NULL */
+ Entry *np = NULL; /* newSuperior Entry */
+ struct berval *np_dn = NULL; /* newSuperior dn */
+ struct berval *np_ndn = NULL; /* newSuperior ndn */
+ struct berval *new_parent_dn = NULL; /* np_dn, p_dn, or NULL */
/* Used to interface with bdb_modify_internal() */
Modifications *mod = NULL; /* Used to delete old rdn */
int manageDSAit = get_manageDSAit( op );
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_ENTRY, "==>bdb_modrdn(%s,%s,%s)\n",
+ dn->bv_val,newrdn->bv_val,
+ newSuperior ? newSuperior->bv_val : "NULL" ));
+#else
Debug( LDAP_DEBUG_TRACE, "==>bdb_modrdn(%s,%s,%s)\n",
dn->bv_val, newrdn->bv_val,
newSuperior ? newSuperior->bv_val : "NULL" );
+#endif
#if 0
if( newSuperior != NULL ) {
if( 0 ) {
retry: /* transaction retry */
+ if (e != NULL) {
+ bdb_cache_delete_entry(&bdb->bi_cache, e);
+ bdb_cache_return_entry_w(&bdb->bi_cache, e);
+ }
+ if (p != NULL) {
+ bdb_cache_return_entry_r(&bdb->bi_cache, p);
+ }
+ if (np != NULL) {
+ bdb_cache_return_entry_r(&bdb->bi_cache, np);
+ }
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "==>bdb_modrdn: retrying...\n"));
+#else
Debug( LDAP_DEBUG_TRACE, "==>bdb_modrdn: retrying...\n", 0, 0, 0 );
- rc = txn_abort( ltid );
+#endif
+ rc = TXN_ABORT( ltid );
ltid = NULL;
op->o_private = NULL;
if( rc != 0 ) {
text = "internal error";
goto return_results;
}
+ ldap_pvt_thread_yield();
}
- if( bdb->bi_txn ) {
- /* begin transaction */
- rc = txn_begin( bdb->bi_dbenv, NULL, <id,
- bdb->bi_db_opflags );
- text = NULL;
- if( rc != 0 ) {
- Debug( LDAP_DEBUG_TRACE,
- "bdb_delete: txn_begin failed: %s (%d)\n",
- db_strerror(rc), rc, 0 );
- rc = LDAP_OTHER;
- text = "internal error";
- goto return_results;
- }
+ /* begin transaction */
+ rc = TXN_BEGIN( bdb->bi_dbenv, NULL, <id,
+ bdb->bi_db_opflags );
+ text = NULL;
+ if( rc != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "==>bdb_modrdn: txn_begin failed: %s (%d)\n", db_strerror(rc), rc ));
+#else
+ Debug( LDAP_DEBUG_TRACE,
+ "bdb_delete: txn_begin failed: %s (%d)\n",
+ db_strerror(rc), rc, 0 );
+#endif
+ rc = LDAP_OTHER;
+ text = "internal error";
+ goto return_results;
}
opinfo.boi_bdb = be;
op->o_private = &opinfo;
/* get entry */
- rc = bdb_dn2entry( be, ltid, ndn, &e, &matched, 0 );
+ rc = bdb_dn2entry_w( be, ltid, ndn, &e, &matched, 0 );
switch( rc ) {
case 0:
case DB_LOCK_DEADLOCK:
case DB_LOCK_NOTGRANTED:
goto retry;
+ case LDAP_BUSY:
+ text = "ldap server busy";
+ goto return_results;
default:
rc = LDAP_OTHER;
text = "internal error";
if ( e == NULL ) {
char* matched_dn = NULL;
- struct berval** refs;
+ BerVarray refs;
if( matched != NULL ) {
- matched_dn = strdup( matched->e_dn );
+ matched_dn = ch_strdup( matched->e_dn );
refs = is_entry_referral( matched )
? get_entry_referrals( be, conn, op, matched )
: NULL;
- bdb_entry_return( be, matched );
+ bdb_cache_return_entry_r( &bdb->bi_cache, matched );
matched = NULL;
} else {
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 );
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "==>bdb_modrdn: entry %s is referral \n", e->e_dn ));
+#else
Debug( LDAP_DEBUG_TRACE, "bdb_modrdn: entry %s is referral\n",
e->e_dn, 0, 0 );
+#endif
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 = dn_parent( be, e->e_ndn );
- np_ndn = p_ndn;
- if ( p_ndn != NULL && p_ndn[ 0 ] != '\0' ) {
+ if ( be_issuffix( be, &e->e_nname ) ) {
+ p_ndn = slap_empty_bv;
+ } else {
+ dnParent( &e->e_nname, &p_ndn );
+ }
+ np_ndn = &p_ndn;
+ if ( p_ndn.bv_len != 0 ) {
/* Make sure parent entry exist and we can write its
* children.
*/
- bv.bv_val = p_ndn;
- bv.bv_len = strlen( p_ndn );
-
- rc = bdb_dn2entry( be, ltid, &bv, &p, NULL, 0 );
+ rc = bdb_dn2entry_r( be, ltid, &p_ndn, &p, NULL, 0 );
switch( rc ) {
case 0:
case DB_LOCK_DEADLOCK:
case DB_LOCK_NOTGRANTED:
goto retry;
+ case LDAP_BUSY:
+ text = "ldap server busy";
+ goto return_results;
default:
rc = LDAP_OTHER;
text = "internal error";
}
if( p == NULL) {
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "==>bdb_modrdn: parent does not exist\n" ));
+#else
Debug( LDAP_DEBUG_TRACE, "bdb_modrdn: parent does not exist\n",
0, 0, 0);
+#endif
rc = LDAP_OTHER;
goto return_results;
}
/* check parent for "children" acl */
if ( ! access_allowed( be, conn, op, p,
- children, NULL, ACL_WRITE ) )
+ children, NULL, ACL_WRITE, NULL ) )
{
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "==>bdb_modrdn: no access to parent\n" ));
+#else
Debug( LDAP_DEBUG_TRACE, "no access to parent\n", 0,
0, 0 );
+#endif
send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
NULL, NULL, NULL, NULL );
goto return_results;
}
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "==>bdb_modrdn: wr to children %s is OK\n", p_ndn.bv_val ));
+#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: wr to children of entry %s OK\n",
- p_ndn, 0, 0 );
+ p_ndn.bv_val, 0, 0 );
+#endif
- p_dn = dn_parent( be, e->e_dn );
+ 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 (( "modrdn", LDAP_LEVEL_DETAIL1, "==>bdb_modrdn: parent dn=%s\n", p_dn.bv_val ));
+#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: parent dn=%s\n",
- p_dn, 0, 0 );
+ p_dn.bv_val, 0, 0 );
+#endif
} else {
/* no parent, modrdn entry directly under root */
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;
/* check parent for "children" acl */
rc = access_allowed( be, conn, op, p,
- children, NULL, ACL_WRITE );
+ children, NULL, ACL_WRITE, NULL );
p = NULL;
if ( ! rc )
{
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "==>bdb_modrdn: no access to parent\n" ));
+#else
Debug( LDAP_DEBUG_TRACE,
"no access to parent\n",
0, 0, 0 );
+#endif
send_ldap_result( conn, op,
LDAP_INSUFFICIENT_ACCESS,
NULL, NULL, NULL, NULL );
goto return_results;
}
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "==>bdb_modrdn: wr to children of entry \"\" OK\n", p_dn.bv_val ));
+#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: wr to children of entry \"\" OK\n",
0, 0, 0 );
+#endif
- p_dn = "";
+ p_dn.bv_val = "";
+ p_dn.bv_len = 0;
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "==>bdb_modrdn: parent dn=\"\" \n" ));
+#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: parent dn=\"\"\n",
0, 0, 0 );
+#endif
} else {
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "==>bdb_modrdn: no parent, not root &\"\" is not suffix\n" ));
+#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: no parent, not root "
"& \"\" is not suffix\n",
0, 0, 0);
+#endif
rc = LDAP_INSUFFICIENT_ACCESS;
goto return_results;
}
}
}
- new_parent_dn = p_dn; /* New Parent unless newSuperior given */
+ new_parent_dn = &p_dn; /* New Parent unless newSuperior given */
if ( newSuperior != NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "==>bdb_modrdn: new parent \"%s\" requested...\n", newSuperior->bv_val ));
+#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: new parent \"%s\" requested...\n",
newSuperior->bv_val, 0, 0 );
+#endif
if ( newSuperior->bv_len ) {
- np_dn = ch_strdup( newSuperior->bv_val );
- np_ndn = ch_strdup( np_dn );
- (void) dn_normalize( np_ndn );
+ np_dn = newSuperior;
+ np_ndn = nnewSuperior;
/* newSuperior == oldParent?, if so ==> ERROR */
/* newSuperior == entry being moved?, if so ==> ERROR */
/* Get Entry with dn=newSuperior. Does newSuperior exist? */
- bv.bv_val = np_ndn;
- bv.bv_len = strlen( np_ndn );
- rc = bdb_dn2entry( be, ltid, &bv, &np, NULL, 0 );
+ rc = bdb_dn2entry_r( be, ltid, nnewSuperior, &np, NULL, 0 );
switch( rc ) {
case 0:
case DB_LOCK_DEADLOCK:
case DB_LOCK_NOTGRANTED:
goto retry;
+ case LDAP_BUSY:
+ text = "ldap server busy";
+ goto return_results;
default:
rc = LDAP_OTHER;
text = "internal error";
}
if( np == NULL) {
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "==>bdb_modrdn: newSup(ndn=%s) not here!\n", np_ndn->bv_val ));
+#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: newSup(ndn=%s) not here!\n",
- np_ndn, 0, 0);
+ np_ndn->bv_val, 0, 0);
+#endif
rc = LDAP_OTHER;
goto return_results;
}
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "==>bdb_modrdn: wr to new parent OK np=%p, id=%ld\n", np, (long) np->e_id ));
+#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: wr to new parent OK np=%p, id=%ld\n",
np, (long) np->e_id, 0 );
+#endif
/* check newSuperior for "children" acl */
- if ( !access_allowed( be, conn, op, np, children, NULL, ACL_WRITE ) ) {
+ if ( !access_allowed( be, conn, op, np, children, NULL, ACL_WRITE, NULL ) ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "==>bdb_modrdn: no wr to newSup children\n" ));
+#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: no wr to newSup children\n",
0, 0, 0 );
+#endif
rc = LDAP_INSUFFICIENT_ACCESS;
goto return_results;
}
+#ifdef BDB_ALIASES
if ( is_entry_alias( np ) ) {
/* parent is an alias, don't allow add */
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "==>bdb_modrdn: entry is alias\n" ));
+#else
Debug( LDAP_DEBUG_TRACE, "bdb_modrdn: entry is alias\n",
0, 0, 0 );
+#endif
rc = LDAP_ALIAS_PROBLEM;
goto return_results;
}
+#endif
if ( is_entry_referral( np ) ) {
/* parent is a referral, don't allow add */
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "==>bdb_modrdn: entry is referral\n" ));
+#else
Debug( LDAP_DEBUG_TRACE, "bdb_modrdn: entry is referral\n",
0, 0, 0 );
+#endif
rc = LDAP_OPERATIONS_ERROR;
goto return_results;
isroot = be_isroot( be, &op->o_ndn );
}
- np_dn = ch_strdup( "" );
+ np_dn = NULL;
/* no parent, modrdn entry directly under root */
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;
/* check parent for "children" acl */
rc = access_allowed( be, conn, op, np,
- children, NULL, ACL_WRITE );
+ children, NULL, ACL_WRITE, NULL );
np = NULL;
if ( ! rc )
{
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "==>bdb_modrdn: no access to superior\n" ));
+#else
Debug( LDAP_DEBUG_TRACE,
"no access to new superior\n",
0, 0, 0 );
+#endif
send_ldap_result( conn, op,
LDAP_INSUFFICIENT_ACCESS,
NULL, NULL, NULL, NULL );
goto return_results;
}
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "bdb_modrdn: wr to children entry \"\" OK\n" ));
+#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: wr to children of entry \"\" OK\n",
0, 0, 0 );
+#endif
} else {
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "bdb_modrdn: new superior=\"\", not root & \"\" is not suffix\n" ));
+#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: new superior=\"\", not root "
"& \"\" is not suffix\n",
0, 0, 0);
+#endif
rc = LDAP_INSUFFICIENT_ACCESS;
goto return_results;
}
}
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "bdb_modrdn: new superior=\"\"\n" ));
+#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: new superior=\"\"\n",
0, 0, 0 );
+#endif
}
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_DETAIL1, "bdb_modrdn: wr to new parent's children OK\n" ));
+#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: wr to new parent's children OK\n",
0, 0, 0 );
+#endif
new_parent_dn = np_dn;
}
/* Build target dn and make sure target entry doesn't exist already. */
- build_new_dn( &new_dn, e->e_dn, new_parent_dn, newrdn->bv_val );
+ build_new_dn( &new_dn, new_parent_dn, newrdn );
- new_ndn = ch_strdup( new_dn );
- (void) dn_normalize( new_ndn );
+ dnNormalize2( NULL, &new_dn, &new_ndn );
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_RESULTS, "bdb_modrdn: new ndn=%s\n", new_ndn.bv_val ));
+#else
Debug( LDAP_DEBUG_TRACE, "bdb_modrdn: new ndn=%s\n",
- new_ndn, 0, 0 );
+ new_ndn.bv_val, 0, 0 );
+#endif
- bv.bv_val = new_ndn;
- bv.bv_len = strlen( new_ndn );
- rc = bdb_dn2id ( be, ltid, &bv, &id );
+ rc = bdb_dn2id ( be, ltid, &new_ndn, &id );
switch( rc ) {
case DB_LOCK_DEADLOCK:
case DB_LOCK_NOTGRANTED:
goto return_results;
}
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "bdb_modrdn: new ndn=%s does not exist\n", new_ndn.bv_val ));
+#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: new ndn=%s does not exist\n",
- new_ndn, 0, 0 );
+ new_ndn.bv_val, 0, 0 );
+#endif
/* 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_bv2rdn( newrdn, &new_rdn, (char **)&text,
+ LDAP_DN_FORMAT_LDAP ) )
+ {
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "bdb_modrdn: can't figure out type(s)/values(s) of newrdn\n" ));
+#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: can't figure out type(s)/values(s) "
"of newrdn\n", 0, 0, 0 );
+#endif
rc = LDAP_OPERATIONS_ERROR;
text = "unknown type(s) used in RDN";
goto return_results;
}
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_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 ));
+#else
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 );
+#endif
- if ( rdn_attrs( old_rdn, &old_rdn_types, &old_rdn_vals ) ) {
+ if ( ldap_bv2rdn( dn, &old_rdn, (char **)&text,
+ LDAP_DN_FORMAT_LDAP ) )
+ {
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "bdb_modrdn: can't figure out type(s)/values(s) of old_rdn\n" ));
+#else
Debug( LDAP_DEBUG_TRACE,
"bdb_back_modrdn: can't figure out the old_rdn "
"type(s)/value(s)\n", 0, 0, 0 );
+#endif
rc = LDAP_OTHER;
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 ) {
/* Not a big deal but we may say something */
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "bdb_modrdn: old_rdn_type(s)=%s, new_rdn_type(s)=%s do not match\n", old_rdn_types[ 0 ], new_rdn_types[ 0 ] ));
+#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: old_rdn_type(s)=%s, new_rdn_type(s)=%s "
"do not match\n",
old_rdn_types[ 0 ], new_rdn_types[ 0 ], 0 );
+#endif
}
+#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 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "bdb_modrdn: %s: %s (new)\n", text, new_rdn[0][a_cnt]->la_attr.bv_val ));
+#else
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 );
+#endif
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, NULL ) ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "bdb_modrdn: access to attr \"%s\" (new) not allowed\n", new_rdn[0][a_cnt]->la_attr.bv_val ));
+#else
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 );
+#endif
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) {
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "bdb_modrdn: can't figure out old RDN values(s) from old RDN\n" ));
+#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modrdn: can't figure out old RDN value(s) "
"from old RDN\n", 0, 0, 0 );
+#endif
rc = LDAP_OTHER;
text = "could not parse value(s) from old RDN";
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 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "bdb_modrdn: %s: %s (old)\n", text, old_rdn[0][d_cnt]->la_attr.bv_val ));
+#else
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 );
+#endif
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, NULL ) ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_ERR, "bdb_modrdn: access to attr \"%s\" (old) not allowed\n", old_rdn[0][d_cnt]->la_attr.bv_val ));
+#else
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 );
+#endif
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;
}
/* delete old one */
- rc = bdb_dn2id_delete( be, ltid, p_ndn, e );
+ rc = bdb_dn2id_delete( be, ltid, p_ndn.bv_val, e );
if ( rc != 0 ) {
switch( rc ) {
case DB_LOCK_DEADLOCK:
goto return_results;
}
+ (void) bdb_cache_delete_entry(&bdb->bi_cache, e);
+
/* Binary format uses a single contiguous block, cannot
* free individual fields. Leave new_dn/new_ndn set so
* they can be individually freed later.
*/
- e->e_dn = new_dn;
- e->e_name.bv_len = strlen( new_dn );
- e->e_ndn = new_ndn;
- e->e_nname.bv_len = strlen( new_ndn );
+ e->e_name = new_dn;
+ e->e_nname = new_ndn;
+
+ new_dn.bv_val = NULL;
+ new_ndn.bv_val = NULL;
/* add new one */
rc = bdb_dn2id_add( be, ltid, np_ndn, e );
goto return_results;
}
- if( bdb->bi_txn ) {
- rc = txn_commit( ltid, 0 );
+ if( op->o_noop ) {
+ if(( rc=TXN_ABORT( ltid )) != 0 ) {
+ text = "txn_abort (no-op) failed";
+ } else {
+ rc = LDAP_SUCCESS;
+ }
+
+ } else {
+ char gid[DB_XIDDATASIZE];
+
+ snprintf( gid, sizeof( gid ), "%s-%08lx-%08lx",
+ bdb_uuid.bv_val, (long) op->o_connid, (long) op->o_opid );
+
+ if(( rc=TXN_PREPARE( ltid, gid )) != 0 ) {
+ text = "txn_prepare failed";
+ } else {
+ if( bdb_cache_update_entry(&bdb->bi_cache, e) == -1 ) {
+ if(( rc=TXN_ABORT( ltid )) != 0 ) {
+ text ="cache update & txn_abort failed";
+ } else {
+ rc = LDAP_OTHER;
+ text = "cache update failed";
+ }
+
+ } else {
+ if(( rc=TXN_COMMIT( ltid, 0 )) != 0 ) {
+ text = "txn_commit failed";
+ } else {
+ rc = LDAP_SUCCESS;
+ }
+ }
+ }
}
+
ltid = NULL;
op->o_private = NULL;
+
+ if( rc == LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_RESULTS, "bdb_modrdn: rdn modified%s id=%08lx dn=\"%s\"\n", op->o_noop ? " (no-op)" : "", e->e_id, e->e_dn ));
+#else
+ Debug(LDAP_DEBUG_TRACE,
+ "bdb_modrdn: rdn modified%s id=%08lx dn=\"%s\"\n",
+ op->o_noop ? " (no-op)" : "", e->e_id, e->e_dn );
+#endif
+ text = NULL;
+ bdb_cache_entry_commit( e );
- if( rc != 0 ) {
- Debug( LDAP_DEBUG_TRACE,
- "bdb_modrdn: txn_commit failed: %s (%d)\n",
- db_strerror(rc), rc, 0 );
- rc = LDAP_OTHER;
- text = "commit failed";
} else {
- Debug( LDAP_DEBUG_TRACE,
- "bdb_modrdn: added id=%08lx dn=\"%s\"\n",
- e->e_id, e->e_dn, 0 );
- rc = LDAP_SUCCESS;
- text = NULL;
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modrdn", LDAP_LEVEL_RESULTS, "bdb_modrdn: %s : %s (%d)\n", text, db_strerror(rc), rc ));
+#else
+ Debug( LDAP_DEBUG_TRACE, "bdb_add: %s : %s (%d)\n",
+ text, db_strerror(rc), rc );
+#endif
+ rc = LDAP_OTHER;
}
return_results:
}
done:
- if( new_dn != NULL ) free( new_dn );
- if( new_ndn != NULL ) free( new_ndn );
-
- if( np_ndn == p_ndn ) np_ndn = NULL;
+ if( new_dn.bv_val != NULL ) free( new_dn.bv_val );
+ 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_dn != NULL ) free( np_dn );
- if ( np_ndn != NULL ) free( np_ndn );
-
if( np != NULL ) {
- /* free new parent and writer lock */
- bdb_entry_return( be, np );
+ /* free new parent and reader lock */
+ bdb_cache_return_entry_r(&bdb->bi_cache, np);
}
if( p != NULL ) {
- /* free parent and writer lock */
- bdb_entry_return( be, p );
+ /* free parent and reader lock */
+ bdb_cache_return_entry_r(&bdb->bi_cache, p);
}
/* free entry */
if( e != NULL ) {
- bdb_entry_return( be, e );
+ bdb_cache_return_entry_w( &bdb->bi_cache, e );
}
if( ltid != NULL ) {
- txn_abort( ltid );
+ TXN_ABORT( ltid );
op->o_private = NULL;
}