/* 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
*/
Backend *be,
Connection *conn,
Operation *op,
- const char *dn,
- const char *ndn,
- const char *newrdn,
+ struct berval *dn,
+ struct berval *ndn,
+ struct berval *newrdn,
+ struct berval *nnewrdn,
int deleteoldrdn,
- const char *newSuperior
+ struct berval *newSuperior,
+ struct berval *nnewSuperior
)
{
AttributeDescription *children = slap_schema.si_ad_children;
struct ldbminfo *li = (struct ldbminfo *) be->be_private;
- 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 };
Entry *e, *p = NULL;
Entry *matched;
+ int isroot = -1;
int rootlock = 0;
#define CAN_ROLLBACK -1
#define MUST_DESTROY 1
char textbuf[SLAP_TEXT_BUFLEN];
size_t textlen = sizeof textbuf;
/* Added to support LDAP v2 correctly (deleteoldrdn thing) */
- char **new_rdn_vals = NULL; /* Vals of new rdn */
- char **new_rdn_types = NULL; /* Types of new rdn */
+ LDAPRDN *new_rdn;
+ LDAPRDN *old_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 attrs. */
- char **old_rdn_vals = NULL; /* Old rdn attribute values */
/* Added to support newSuperior */
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 */
+ struct berval *np_ndn = NULL; /* newSuperior ndn */
+ struct berval *new_parent_dn = NULL; /* np_dn, p_dn, or NULL */
/* Used to interface with ldbm_modify_internal() */
Modifications *mod = NULL; /* Used to delete old/add new rdn */
int manageDSAit = get_manageDSAit( op );
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
- "ldbm_back_modrdn: dn: %s newSuperior=%s\n",
- dn ? dn : "NULL", newSuperior ? newSuperior : "NULL" ));
+ "ldbm_back_modrdn: dn: %s newSuperior=%s\n",
+ dn->bv_len ? dn->bv_val : "NULL",
+ ( newSuperior && newSuperior->bv_len )
+ ? newSuperior->bv_val : "NULL" ));
#else
- Debug( LDAP_DEBUG_TRACE, "==>ldbm_back_modrdn(newSuperior=%s)\n",
- (newSuperior ? newSuperior : "NULL"),
- 0, 0 );
+ Debug( LDAP_DEBUG_TRACE,
+ "==>ldbm_back_modrdn: dn: %s newSuperior=%s\n",
+ dn->bv_len ? dn->bv_val : "NULL",
+ ( newSuperior && newSuperior->bv_len )
+ ? newSuperior->bv_val : "NULL", 0 );
#endif
/* get entry with writer lock */
if ( (e = dn2entry_w( be, ndn, &matched )) == NULL ) {
char* matched_dn = NULL;
- struct berval** refs = NULL;
+ BVarray refs;
if( matched != NULL ) {
matched_dn = strdup( matched->e_dn );
: NULL;
cache_return_entry_r( &li->li_cache, matched );
} else {
- refs = default_referral;
+ refs = referral_rewrite( default_referral,
+ NULL, dn, LDAP_SCOPE_DEFAULT );
}
send_ldap_result( conn, op, LDAP_REFERRAL,
matched_dn, NULL, refs, NULL );
- if ( matched != NULL ) {
- ber_bvecfree( refs );
- free( matched_dn );
- }
+ if ( refs ) 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,
+ BVarray refs = get_entry_referrals( be,
conn, op, e );
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
- "ldbm_back_modrdn: entry %s is a referral\n", e->e_dn ));
+ "ldbm_back_modrdn: entry %s is a referral\n", e->e_dn ));
#else
- Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0,
+ Debug( LDAP_DEBUG_TRACE, "entry %s is referral\n", e->e_dn,
0, 0 );
#endif
send_ldap_result( conn, op, LDAP_REFERRAL,
e->e_dn, NULL, refs, NULL );
- ber_bvecfree( refs );
+ if ( refs ) bvarray_free( refs );
goto return_results;
}
if ( has_children( be, e ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
- "ldbm_back_modrdn: entry %s has children\n", e->e_dn ));
+ "ldbm_back_modrdn: entry %s has children\n", e->e_dn ));
#else
- Debug( LDAP_DEBUG_TRACE, "entry %s referral\n", e->e_dn,
+ Debug( LDAP_DEBUG_TRACE, "entry %s has children\n", e->e_dn,
0, 0 );
#endif
goto return_results;
}
- if ( (p_ndn = dn_parent( be, e->e_ndn )) != NULL && p_ndn[0] != '\0' ) {
+ 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 ( p_ndn.bv_len != 0 ) {
/* Make sure parent entry exist and we can write its
* children.
*/
- if( (p = dn2entry_w( be, p_ndn, 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 ));
+ "ldbm_back_modrdn: parent of %s does not exist\n", e->e_ndn ));
#else
Debug( LDAP_DEBUG_TRACE, "parent does not exist\n",
0, 0, 0);
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"ldbm_back_modrdn: wr to children of entry %s OK\n",
- p_ndn ));
+ p_ndn.bv_val ));
#else
Debug( LDAP_DEBUG_TRACE,
"ldbm_back_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 );
+ 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;
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
- "ldbm_back_modrdn: parent dn=%s\n", p_dn ));
+ "ldbm_back_modrdn: parent dn=%s\n", p_dn.bv_val ));
#else
Debug( LDAP_DEBUG_TRACE, "ldbm_back_modrdn: parent dn=%s\n",
- p_dn, 0, 0 );
+ p_dn.bv_val, 0, 0 );
#endif
} else {
- /* no parent, modrdn entry directly under root */
- if( ! be_isroot( be, op->o_ndn ) && ! be_issuffix( be, "" ) ) {
+ /* 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 ) ) {
+ p = (Entry *)&slap_entry_root;
+
+ rc = access_allowed( be, conn, op, p,
+ children, NULL, ACL_WRITE );
+ p = NULL;
+
+ /* check parent for "children" acl */
+ if ( ! rc ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
- "ldbm_back_modrdn: (%s) no parent & not a root.\n",
- e->e_dn ));
+ LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
+ "ldbm_back_modrdn: no access "
+ "to parent \"\"\n" ));
#else
- Debug( LDAP_DEBUG_TRACE, "no parent & not root\n",
- 0, 0, 0);
+ Debug( LDAP_DEBUG_TRACE,
+ "<=- ldbm_back_modrdn: no "
+ "access to parent\n", 0, 0, 0 );
#endif
- send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
- NULL, NULL, NULL, NULL );
- goto return_results;
+ send_ldap_result( conn, op,
+ LDAP_INSUFFICIENT_ACCESS,
+ NULL, NULL, NULL, NULL );
+ goto return_results;
+ }
+
+ } else {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
+ "ldbm_back_modrdn: (%s) has no "
+ "parent & not a root.\n", dn ));
+#else
+ Debug( LDAP_DEBUG_TRACE,
+ "<=- ldbm_back_modrdn: no parent & "
+ "not root\n", 0, 0, 0);
+#endif
+
+ send_ldap_result( conn, op,
+ LDAP_INSUFFICIENT_ACCESS,
+ NULL, NULL, NULL, NULL );
+ goto return_results;
+ }
}
ldap_pvt_thread_mutex_lock(&li->li_root_mutex);
#endif
}
- 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(( "backend", LDAP_LEVEL_DETAIL1,
- "ldbm_back_modrdn: new parent \"%s\" requested\n", newSuperior ));
+ "ldbm_back_modrdn: new parent \"%s\" requested\n",
+ newSuperior->bv_val ));
#else
Debug( LDAP_DEBUG_TRACE,
"ldbm_back_modrdn: new parent \"%s\" requested...\n",
- newSuperior, 0, 0 );
+ newSuperior->bv_val, 0, 0 );
#endif
- np_dn = ch_strdup( newSuperior );
- np_ndn = ch_strdup( np_dn );
- (void) dn_normalize( np_ndn );
+ np_ndn = nnewSuperior;
/* newSuperior == oldParent? */
- if ( strcmp( p_ndn, np_ndn ) == 0 ) {
+ if ( p_ndn.bv_len == np_ndn->bv_len &&
+ strcmp( p_ndn.bv_val, np_ndn->bv_val ) == 0 ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
- "ldbm_back_modrdn: new parent\"%s\" seems to be the same as the old parent \"%s\"\n",
- newSuperior, p_dn ));
+ LDAP_LOG(( "backend", LDAP_LEVEL_INFO, "ldbm_back_modrdn: "
+ "new parent\"%s\" seems to be the same as the "
+ "old parent \"%s\"\n",
+ newSuperior->bv_val, p_dn.bv_val ));
#else
- Debug( LDAP_DEBUG_TRACE,
- "ldbm_back_modrdn: new parent \"%s\" seems to be the same as old parent \"%s\"...\n",
- newSuperior, p_dn, 0 );
+ Debug( LDAP_DEBUG_TRACE, "ldbm_back_modrdn: "
+ "new parent\"%s\" seems to be the same as the "
+ "old parent \"%s\"\n",
+ newSuperior->bv_val, p_dn.bv_val, 0 );
#endif
newSuperior = NULL; /* ignore newSuperior */
/* newSuperior == entry being moved?, if so ==> ERROR */
/* Get Entry with dn=newSuperior. Does newSuperior exist? */
- if( (np = dn2entry_w( be, np_ndn, NULL )) == NULL) {
+ if ( nnewSuperior->bv_len ) {
+ 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 ));
+ LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
+ "ldbm_back_modrdn: newSup(ndn=%s) not found.\n", np_ndn->bv_val ));
#else
- Debug( LDAP_DEBUG_TRACE,
- "ldbm_back_modrdn: newSup(ndn=%s) not here!\n",
- np_ndn, 0, 0);
+ Debug( LDAP_DEBUG_TRACE,
+ "ldbm_back_modrdn: newSup(ndn=%s) not here!\n",
+ np_ndn->bv_val, 0, 0);
#endif
- send_ldap_result( conn, op, LDAP_OTHER,
- NULL, "newSuperior not found", NULL, NULL );
- goto return_results;
- }
+ send_ldap_result( conn, op, LDAP_OTHER,
+ NULL, "newSuperior not found", NULL, NULL );
+ goto return_results;
+ }
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
- "ldbm_back_modrdn: wr to new parent OK np=%p, id=%ld\n",
- np, np->e_id ));
+ LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
+ "ldbm_back_modrdn: wr to new parent OK np=%p, id=%ld\n",
+ np, np->e_id ));
#else
- Debug( LDAP_DEBUG_TRACE,
- "ldbm_back_modrdn: wr to new parent OK np=%p, id=%ld\n",
- np, np->e_id, 0 );
+ Debug( LDAP_DEBUG_TRACE,
+ "ldbm_back_modrdn: wr to new parent OK np=%p, id=%ld\n",
+ np, np->e_id, 0 );
#endif
- /* check newSuperior for "children" acl */
- if ( !access_allowed( be, conn, op, np, children, NULL,
- ACL_WRITE ) )
- {
+ /* check newSuperior for "children" acl */
+ if ( !access_allowed( be, conn, op, np, children, NULL,
+ ACL_WRITE ) )
+ {
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
- "ldbm_back_modrdn: no wr to newSup children.\n" ));
+ LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
+ "ldbm_back_modrdn: no wr to newSup children.\n" ));
#else
- Debug( LDAP_DEBUG_TRACE,
- "ldbm_back_modrdn: no wr to newSup children\n",
- 0, 0, 0 );
+ Debug( LDAP_DEBUG_TRACE,
+ "ldbm_back_modrdn: no wr to newSup children\n",
+ 0, 0, 0 );
#endif
- send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
- NULL, NULL, NULL, NULL );
- goto return_results;
- }
+ send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
+ NULL, NULL, NULL, NULL );
+ goto return_results;
+ }
- if ( is_entry_alias( np ) ) {
- /* entry is an alias, don't allow bind */
+ if ( is_entry_alias( np ) ) {
+ /* parent is an alias, don't allow add */
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
- "ldbm_back_modrdn: entry (%s) is an alias.\n", np->e_dn ));
+ LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
+ "ldbm_back_modrdn: entry (%s) is an alias.\n", np->e_dn ));
#else
- Debug( LDAP_DEBUG_TRACE, "entry is alias\n", 0,
- 0, 0 );
+ Debug( LDAP_DEBUG_TRACE, "entry is alias\n", 0, 0, 0 );
#endif
- send_ldap_result( conn, op, LDAP_ALIAS_PROBLEM,
- NULL, "newSuperior is an alias", NULL, NULL );
+ send_ldap_result( conn, op, LDAP_ALIAS_PROBLEM,
+ NULL, "newSuperior is an alias", NULL, NULL );
- goto return_results;
- }
+ goto return_results;
+ }
- if ( is_entry_referral( np ) ) {
- /* parent is a referral, don't allow add */
- /* parent is an alias, don't allow add */
+ if ( is_entry_referral( np ) ) {
+ /* parent is a referral, don't allow add */
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
- "ldbm_back_modrdn: entry (%s) is a referral\n",
- np->e_dn ));
+ LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
+ "ldbm_back_modrdn: entry (%s) is a referral\n",
+ np->e_dn ));
#else
- Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0,
- 0, 0 );
+ Debug( LDAP_DEBUG_TRACE, "entry (%s) is referral\n",
+ np->e_dn, 0, 0 );
#endif
- send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
- NULL, "newSuperior is a referral", NULL, NULL );
+ send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+ NULL, "newSuperior is a referral", NULL, NULL );
- goto return_results;
+ goto return_results;
+ }
+
+ } else {
+
+ /* no parent, must be root to modify newSuperior */
+ if ( isroot == -1 ) {
+ isroot = be_isroot( be, &op->o_ndn );
+ }
+
+ if ( ! isroot ) {
+ if ( be_issuffix( be, "" ) || be_isupdate( be, &op->o_ndn ) ) {
+ np = (Entry *)&slap_entry_root;
+
+ rc = access_allowed( be, conn, op, np,
+ children, NULL, ACL_WRITE );
+ np = NULL;
+
+ /* check parent for "children" acl */
+ if ( ! rc ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
+ "ldbm_back_modrdn: no access "
+ "to new superior \"\"\n" ));
+#else
+ Debug( LDAP_DEBUG_TRACE,
+ "<=- ldbm_back_modrdn: 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;
+ }
+
+ } else {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
+ "ldbm_back_modrdn: \"\" "
+ "not allowed as new superior\n" ));
+#else
+ Debug( LDAP_DEBUG_TRACE,
+ "<=- ldbm_back_modrdn: \"\" "
+ "not allowed as 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(( "backend", LDAP_LEVEL_DETAIL1,
- "ldbm_back_modrdn: wr to new parent's children OK.\n" ));
+ "ldbm_back_modrdn: wr to new parent's children OK.\n" ));
#else
Debug( LDAP_DEBUG_TRACE,
- "ldbm_back_modrdn: wr to new parent's children OK\n",
- 0, 0 , 0 );
+ "ldbm_back_modrdn: wr to new parent's children OK\n",
+ 0, 0, 0 );
#endif
- new_parent_dn = np_dn;
+ new_parent_dn = newSuperior;
}
/* Build target dn and make sure target entry doesn't exist already. */
- build_new_dn( &new_dn, e->e_dn, new_parent_dn, newrdn );
-
- new_ndn = ch_strdup(new_dn);
- (void) dn_normalize( new_ndn );
+ build_new_dn( &new_dn, new_parent_dn, newrdn );
+ dnNormalize2( NULL, &new_dn, &new_ndn );
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
- "ldbm_back_modrdn: new ndn=%s\n", new_ndn ));
+ "ldbm_back_modrdn: new ndn=%s\n", new_ndn.bv_val ));
#else
Debug( LDAP_DEBUG_TRACE, "ldbm_back_modrdn: new ndn=%s\n",
- new_ndn, 0, 0 );
+ new_ndn.bv_val, 0, 0 );
#endif
/* check for abandon */
}
ldap_pvt_thread_mutex_unlock( &op->o_abandonmutex );
- if ( ( rc_id = dn2id ( be, new_ndn, &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,
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
- "ldbm_back_modrdn: new ndn (%s) does not exist\n", new_ndn ));
+ "ldbm_back_modrdn: new ndn (%s) does not exist\n", new_ndn.bv_val ));
#else
Debug( LDAP_DEBUG_TRACE,
- "ldbm_back_modrdn: new ndn=%s does not exist\n",
- new_ndn, 0, 0 );
+ "ldbm_back_modrdn: new ndn=%s does not exist\n",
+ new_ndn.bv_val, 0, 0 );
#endif
/* Get attribute types and values of our new rdn, we will
* need to add that to our new entry
*/
- if ( rdn_attrs( newrdn, &new_rdn_types, &new_rdn_vals ) ) {
+ 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" ));
+ "ldbm_back_modrdn: can't figure out type(s)/value(s) of newrdn\n" ));
#else
Debug( LDAP_DEBUG_TRACE,
- "ldbm_back_modrdn: can't figure out type(s)/value(s) of newrdn\n",
- 0, 0, 0 );
+ "ldbm_back_modrdn: can't figure out type(s)/value(s) of newrdn\n",
+ 0, 0, 0 );
#endif
send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
- "ldbm_back_modrdn: new_rdn_val=\"%s\", new_rdn_type=\"%s\"\n",
- new_rdn_vals[0], new_rdn_types[0] ));
+ "ldbm_back_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,
- "ldbm_back_modrdn: new_rdn_val=\"%s\", new_rdn_type=\"%s\"\n",
- new_rdn_vals[0], new_rdn_types[0], 0 );
+ "ldbm_back_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
/* Retrieve the old rdn from the entry's dn */
- if ( (old_rdn = dn_rdn( be, dn )) == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
- "ldbm_back_modrdn: can't figure out old_rdn from dn (%s)\n",
- dn ));
-#else
- Debug( LDAP_DEBUG_TRACE,
- "ldbm_back_modrdn: can't figure out old_rdn from dn\n",
- 0, 0, 0 );
-#endif
-
- send_ldap_result( conn, op, LDAP_OTHER,
- NULL, "could not parse old DN", NULL, NULL );
- goto return_results;
- }
-
- 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 ) )
+ {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_modrdn: can't figure out the old_rdn type(s)/value(s).\n" ));
NULL, "unable to parse type(s)/value(s) used in RDN from old DN", NULL, NULL );
goto return_results;
}
-
+
+#if 0
if ( newSuperior == NULL
&& charray_strcasecmp( (const char **)old_rdn_types, (const char **)new_rdn_types ) != 0 )
{
old_rdn_types[0], new_rdn_types[0], 0 );
#endif
}
+#endif
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
#endif
mod = NULL;
- for ( a_cnt = 0; new_rdn_types[a_cnt]; a_cnt++ ) {
- int rc;
- Modifications *mod_tmp;
- struct berval val;
-
- mod_tmp = (Modifications *)ch_malloc( sizeof( Modifications ) );
+ for ( a_cnt = 0; new_rdn[0][a_cnt]; a_cnt++ ) {
+ int rc;
+ AttributeDescription *desc = NULL;
+ Modifications *mod_tmp;
- mod_tmp->sml_desc = NULL;
- rc = slap_str2ad( new_rdn_types[a_cnt],
- &mod_tmp->sml_desc, &text );
+ rc = slap_bv2ad( &new_rdn[0][a_cnt]->la_attr, &desc, &text );
if ( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
- "ldbm_back_modrdn: slap_str2ad error: %s (%s)\n",
- text, new_rdn_types[a_cnt] ));
+ "ldbm_back_modrdn: slap_bv2ad error: %s (%s)\n",
+ text, new_rdn[0][a_cnt]->la_attr.bv_val ));
#else
Debug( LDAP_DEBUG_TRACE,
"ldbm_back_modrdn: %s: %s (new)\n",
- text, new_rdn_types[a_cnt], 0 );
+ text, new_rdn[0][a_cnt]->la_attr.bv_val, 0 );
#endif
send_ldap_result( conn, op, rc,
goto return_results;
}
- val.bv_val = new_rdn_vals[a_cnt];
- val.bv_len = strlen( val.bv_val );
- if ( ! access_allowed( be, conn, op, p,
- mod_tmp->sml_desc, &val, ACL_WRITE ) ) {
+ if ( ! access_allowed( be, conn, op, e,
+ desc, &new_rdn[0][a_cnt]->la_value, ACL_WRITE ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_modrdn: access "
"not allowed to attr \"%s\"\n",
- new_rdn_types[a_cnt] ));
+ new_rdn[0][a_cnt]->la_attr.bv_val ));
#else
Debug( LDAP_DEBUG_TRACE,
"ldbm_back_modrdn: access not allowed "
"to attr \"%s\"\n%s%s",
- new_rdn_types[a_cnt], "", "" );
+ new_rdn[0][a_cnt]->la_attr.bv_val, "", "" );
#endif
send_ldap_result( conn, op,
LDAP_INSUFFICIENT_ACCESS,
goto return_results;
}
- 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 = (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[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(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_modrdn: can't figure out old RDN value(s) from old RDN\n" ));
goto return_results;
}
- for ( d_cnt = 0; old_rdn_types[d_cnt]; d_cnt++ ) {
- int rc;
- Modifications *mod_tmp;
- struct berval val;
+ for ( d_cnt = 0; old_rdn[0][d_cnt]; d_cnt++ ) {
+ int rc;
+ AttributeDescription *desc = NULL;
+ Modifications *mod_tmp;
- mod_tmp = (Modifications *)ch_malloc( sizeof( Modifications ) );
-
- mod_tmp->sml_desc = NULL;
- rc = slap_str2ad( old_rdn_types[d_cnt],
- &mod_tmp->sml_desc, &text );
+ rc = slap_bv2ad( &old_rdn[0][d_cnt]->la_attr, &desc, &text );
if ( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_modrdn: %s: %s (old)\n",
- text, old_rdn_types[d_cnt] ));
+ text, old_rdn[0][d_cnt]->la_attr.bv_val ));
#else
Debug( LDAP_DEBUG_TRACE,
"ldbm_back_modrdn: %s: %s (old)\n",
- text, old_rdn_types[d_cnt], 0 );
+ text, old_rdn[0][d_cnt]->la_attr.bv_val, 0 );
#endif
send_ldap_result( conn, op, rc,
goto return_results;
}
- val.bv_val = old_rdn_vals[a_cnt];
- val.bv_len = strlen( val.bv_val );
- if ( ! access_allowed( be, conn, op, p,
- mod_tmp->sml_desc, &val, ACL_WRITE ) ) {
+ if ( ! access_allowed( be, conn, op, e,
+ desc, &old_rdn[0][d_cnt]->la_value, ACL_WRITE ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_back_modrdn: access "
"not allowed to attr \"%s\"\n",
- old_rdn_types[a_cnt] ));
+ old_rdn[0][d_cnt]->la_attr.bv_val ));
#else
Debug( LDAP_DEBUG_TRACE,
"ldbm_back_modrdn: access not allowed "
"to attr \"%s\"\n%s%s",
- old_rdn_types[a_cnt], "", "" );
+ old_rdn[0][d_cnt]->la_attr.bv_val, "", "" );
#endif
send_ldap_result( conn, op,
LDAP_INSUFFICIENT_ACCESS,
}
/* Remove old value of rdn as an attribute. */
- 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 = (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[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;
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
- "ldbm_back_modrdn: removing old_rdn_val=%s\n", old_rdn_vals[0] ));
+ "ldbm_back_modrdn: removing old_rdn_val=%s\n", old_rdn[0][d_cnt]->la_value.bv_val ));
#else
Debug( LDAP_DEBUG_TRACE,
"ldbm_back_modrdn: removing old_rdn_val=%s\n",
- old_rdn_vals[0], 0, 0 );
+ old_rdn[0][d_cnt]->la_value.bv_val, 0, 0 );
#endif
}
}
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;
free( e->e_dn );
free( e->e_ndn );
- e->e_dn = new_dn;
- e->e_ndn = new_ndn;
- new_dn = NULL;
- new_ndn = NULL;
+ e->e_name = new_dn;
+ e->e_nname = new_ndn;
+ new_dn.bv_val = NULL;
+ 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;
}
/* modify memory copy of entry */
- rc = ldbm_modify_internal( be, conn, op, dn, &mod[0], e,
+ rc = ldbm_modify_internal( be, conn, op, dn->bv_val, &mod[0], e,
&text, textbuf, textlen );
if( rc != LDAP_SUCCESS ) {
send_ldap_result( conn, op, rc,
NULL, text, NULL, NULL );
}
+
+ /* here we may try to delete the newly added dn */
+ if ( dn2id_delete( be, &e->e_nname, e->e_id ) != 0 ) {
+ /* we already are in trouble ... */
+ ;
+ }
- goto return_results;
+ goto return_results;
}
(void) cache_update_entry( &li->li_cache, e );
cache_entry_commit( e );
return_results:
- if( new_dn != NULL ) free( new_dn );
- if( new_ndn != NULL ) free( new_ndn );
-
- if( p_dn != NULL ) free( p_dn );
- if( p_ndn != NULL ) free( p_ndn );
+ 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( new_rdn ) ldap_rdnfree( new_rdn );
+ if( old_rdn ) ldap_rdnfree( old_rdn );
if ( mod != NULL ) {
- slap_mods_free( mod );
+ 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 */
cache_return_entry_w( &li->li_cache, np );
projects / openldap / blobdiff