mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-12-15 03:01:09 +08:00
Added full v2 and v3 support for MODRDN/MODDN.
This commit is contained in:
Juan Gomez
parent
3eaae95aa1
commit
3b4fdbfeb3
@ -42,6 +42,24 @@ bdb2i_back_modrdn_internal(
|
||||
char sep[2];
|
||||
Entry *e, *p = NULL;
|
||||
int rc = -1;
|
||||
/* Added to support LDAP v2 correctly (deleteoldrdn thing) */
|
||||
char *new_rdn_val = NULL; /* Val of new rdn */
|
||||
char *new_rdn_type = NULL; /* Type of new rdn */
|
||||
char *old_rdn; /* Old rdn's attr type & val */
|
||||
char *old_rdn_type = NULL; /* Type of old rdn attr. */
|
||||
char *old_rdn_val = NULL; /* Old rdn attribute value */
|
||||
struct berval bv; /* Stores new rdn att */
|
||||
struct berval *bvals[2]; /* Stores new rdn att */
|
||||
LDAPMod mod; /* Used to delete old rdn */
|
||||
/* 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 */
|
||||
|
||||
Debug( LDAP_DEBUG_TRACE, "==>ldbm_back_modrdn(newSuperior=%s)\n",\
|
||||
(newSuperior ? newSuperior : "NULL"),\
|
||||
0, 0 );
|
||||
|
||||
/* get entry with writer lock */
|
||||
if ( (e = bdb2i_dn2entry_w( be, dn, &matched )) == NULL ) {
|
||||
@ -89,26 +107,10 @@ bdb2i_back_modrdn_internal(
|
||||
#endif
|
||||
|
||||
p_dn = dn_parent( be, e->e_dn );
|
||||
new_dn = (char *) ch_malloc( strlen( p_dn ) + strlen( newrdn )
|
||||
+ 3 );
|
||||
if ( dn_type( e->e_dn ) == DN_X500 ) {
|
||||
strcpy( new_dn, newrdn );
|
||||
strcat( new_dn, "," );
|
||||
strcat( new_dn, p_dn );
|
||||
} else {
|
||||
char *s;
|
||||
strcpy( new_dn, newrdn );
|
||||
s = strchr( newrdn, '\0' );
|
||||
s--;
|
||||
if ( *s != '.' && *s != '@' ) {
|
||||
if ( (s = strpbrk( dn, ".@" )) != NULL ) {
|
||||
sep[0] = *s;
|
||||
sep[1] = '\0';
|
||||
strcat( new_dn, sep );
|
||||
}
|
||||
}
|
||||
strcat( new_dn, p_dn );
|
||||
}
|
||||
|
||||
Debug( LDAP_DEBUG_TRACE, "ldbm_back_modrdn: parent dn=%s\n",
|
||||
p_dn, 0, 0 );
|
||||
|
||||
|
||||
} else {
|
||||
/* no parent, modrdn entry directly under root */
|
||||
@ -120,11 +122,76 @@ bdb2i_back_modrdn_internal(
|
||||
goto return_results;
|
||||
}
|
||||
|
||||
new_dn = ch_strdup( newrdn );
|
||||
Debug( LDAP_DEBUG_TRACE,
|
||||
"ldbm_back_modrdn: no parent!, working on root\n",
|
||||
0, 0, 0 );
|
||||
|
||||
}
|
||||
|
||||
new_parent_dn = p_dn; /* New Parent unless newSuperior given */
|
||||
|
||||
if ( (np_dn = newSuperior) != NULL) {
|
||||
|
||||
|
||||
Debug( LDAP_DEBUG_TRACE,
|
||||
"ldbm_back_modrdn: new parent requested...\n",
|
||||
0, 0, 0 );
|
||||
|
||||
np_ndn = dn_normalize_case( ch_strdup( np_dn ) );
|
||||
|
||||
/* newSuperior == oldParent?, if so ==> ERROR */
|
||||
|
||||
/* newSuperior == entry being moved?, if so ==> ERROR */
|
||||
|
||||
/* Get Entry with dn=newSuperior. Does newSuperior exist? */
|
||||
|
||||
if( (np = bdb2i_dn2entry_w( be, np_ndn, &matched )) == NULL) {
|
||||
|
||||
Debug( LDAP_DEBUG_TRACE,
|
||||
"ldbm_back_modrdn: newSup(ndn=%s) not here!\n",
|
||||
np_ndn, 0, 0);
|
||||
send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, "",
|
||||
"");
|
||||
goto return_results;
|
||||
}
|
||||
|
||||
Debug( LDAP_DEBUG_TRACE,
|
||||
"ldbm_back_modrdn: wr to new parent OK np=%p, id=%d\n",
|
||||
np, np->e_id, 0 );
|
||||
|
||||
#ifndef SLAPD_CHILD_MODIFICATION_WITH_ENTRY_ACL
|
||||
/* check newSuperior for "children" acl */
|
||||
if ( !access_allowed( be, conn, op, np, "children", NULL,
|
||||
ACL_WRITE ) )
|
||||
{
|
||||
Debug( LDAP_DEBUG_TRACE,
|
||||
"ldbm_back_modrdn: no wr to newSup children\n",
|
||||
0, 0, 0 );
|
||||
send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
|
||||
"", "" );
|
||||
goto return_results;
|
||||
}
|
||||
#endif
|
||||
|
||||
Debug( LDAP_DEBUG_TRACE,
|
||||
"ldbm_back_modrdn: wr to new parent's children OK\n",
|
||||
0, 0 , 0 );
|
||||
|
||||
|
||||
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 );
|
||||
|
||||
|
||||
new_ndn = dn_normalize_case( ch_strdup( new_dn ) );
|
||||
|
||||
Debug( LDAP_DEBUG_TRACE, "ldbm_back_modrdn: new ndn=%s\n",
|
||||
new_ndn, 0, 0 );
|
||||
|
||||
if ( (bdb2i_dn2id ( be, new_ndn ) ) != NOID ) {
|
||||
send_ldap_result( conn, op, LDAP_ALREADY_EXISTS, NULL, NULL );
|
||||
goto return_results;
|
||||
@ -155,17 +222,160 @@ bdb2i_back_modrdn_internal(
|
||||
free( e->e_ndn );
|
||||
e->e_dn = new_dn;
|
||||
e->e_ndn = new_ndn;
|
||||
(void) bdb2i_cache_update_entry( &li->li_cache, e );
|
||||
|
||||
/*
|
||||
* At some point here we need to update the attribute values in
|
||||
* the entry itself that were effected by this RDN change
|
||||
* (respecting the value of the deleteoldrdn parameter).
|
||||
*
|
||||
* Since the code to do this has not yet been written, treat this
|
||||
* omission as a (documented) bug.
|
||||
/* Get attribute type and attribute value of our new rdn, we will
|
||||
* need to add that to our new entry
|
||||
*/
|
||||
|
||||
if ( (new_rdn_type = rdn_attr_type( newrdn )) == NULL ) {
|
||||
|
||||
Debug( LDAP_DEBUG_TRACE,
|
||||
"ldbm_back_modrdn: can't figure out type of newrdn\n",
|
||||
0, 0, 0 );
|
||||
send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, "", "" );
|
||||
goto return_results;
|
||||
|
||||
}
|
||||
|
||||
if ( (new_rdn_val = rdn_attr_value( newrdn )) == NULL ) {
|
||||
|
||||
Debug( LDAP_DEBUG_TRACE,
|
||||
"ldbm_back_modrdn: can't figure out val of newrdn\n",
|
||||
0, 0, 0 );
|
||||
send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, "", "" );
|
||||
goto return_results;
|
||||
|
||||
}
|
||||
|
||||
Debug( LDAP_DEBUG_TRACE,\
|
||||
"ldbm_back_modrdn: new_rdn_val=%s, new_rdn_type=%s\n",\
|
||||
new_rdn_val, new_rdn_type, 0 );
|
||||
|
||||
/* Retrieve the old rdn from the entry's dn */
|
||||
|
||||
if ( (old_rdn = dn_rdn( be, dn )) == NULL ) {
|
||||
|
||||
Debug( LDAP_DEBUG_TRACE,
|
||||
"ldbm_back_modrdn: can't figure out old_rdn from dn\n",
|
||||
0, 0, 0 );
|
||||
send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, "", "" );
|
||||
goto return_results;
|
||||
|
||||
}
|
||||
|
||||
if ( (old_rdn_type = rdn_attr_type( old_rdn )) == NULL ) {
|
||||
|
||||
Debug( LDAP_DEBUG_TRACE,
|
||||
"ldbm_back_modrdn: can't figure out the old_rdn type\n",
|
||||
0, 0, 0 );
|
||||
send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, "", "" );
|
||||
goto return_results;
|
||||
|
||||
}
|
||||
|
||||
if ( strcasecmp( old_rdn_type, new_rdn_type ) != 0 ) {
|
||||
|
||||
/* Not a big deal but we may say something */
|
||||
Debug( LDAP_DEBUG_TRACE,\
|
||||
"ldbm_back_modrdn: old_rdn_type=%s, new_rdn_type=%s!\n",\
|
||||
old_rdn_type, new_rdn_type, 0 );
|
||||
|
||||
}
|
||||
|
||||
if ( dn_type( old_rdn ) == DN_X500 ) {
|
||||
|
||||
Debug( LDAP_DEBUG_TRACE, "ldbm_back_modrdn: DN_X500\n",
|
||||
0, 0, 0 );
|
||||
|
||||
bvals[0] = &bv; /* Array of bervals */
|
||||
bvals[1] = NULL;
|
||||
|
||||
/* Remove old rdn value if required */
|
||||
|
||||
if (deleteoldrdn) {
|
||||
|
||||
/* Get value of old rdn */
|
||||
|
||||
if ((old_rdn_val = rdn_attr_value( old_rdn ))
|
||||
== NULL) {
|
||||
|
||||
Debug( LDAP_DEBUG_TRACE,
|
||||
"ldbm_back_modrdn: can't figure out old_rdn_val from old_rdn\n",
|
||||
0, 0, 0 );
|
||||
send_ldap_result( conn, op,
|
||||
LDAP_OPERATIONS_ERROR,
|
||||
"", "" );
|
||||
goto return_results;
|
||||
|
||||
|
||||
}
|
||||
|
||||
/* Remove old value of rdn as an attribute. */
|
||||
|
||||
bv.bv_val = old_rdn_val;
|
||||
bv.bv_len = strlen(old_rdn_val);
|
||||
|
||||
/* No need to normalize old_rdn_type, delete_values()
|
||||
* does that for us
|
||||
*/
|
||||
mod.mod_type = old_rdn_type;
|
||||
mod.mod_bvalues = bvals;
|
||||
mod.mod_op = LDAP_MOD_DELETE; /* XXX:really needed?*/
|
||||
|
||||
/* Assembly mod structure */
|
||||
|
||||
if ( delete_values( e, &mod, op->o_ndn )
|
||||
!= LDAP_SUCCESS ) {
|
||||
|
||||
/* Could not find old_rdn as an attribute or
|
||||
* the old value was not present. Return an
|
||||
* error.
|
||||
*/
|
||||
Debug( LDAP_DEBUG_TRACE,
|
||||
"ldbm_back_modrdn: old rdn not found or att type doesn't exist\n",
|
||||
0, 0, 0);
|
||||
send_ldap_result( conn, op,
|
||||
LDAP_OPERATIONS_ERROR,
|
||||
"", "");
|
||||
goto return_results;
|
||||
|
||||
}
|
||||
|
||||
Debug( LDAP_DEBUG_TRACE,\
|
||||
"ldbm_back_modrdn: removed old_rdn_val=%s\n",\
|
||||
old_rdn_val, 0, 0 );
|
||||
|
||||
}/* if (deleteoldrdn) */
|
||||
|
||||
/* Add new attribute value to the entry.
|
||||
*/
|
||||
|
||||
bv.bv_val = new_rdn_val;
|
||||
bv.bv_len = strlen(new_rdn_val);
|
||||
|
||||
|
||||
Debug( LDAP_DEBUG_TRACE,
|
||||
"ldbm_back_modrdn: adding new rdn attr val =%s\n",
|
||||
new_rdn_val, 0, 0 );
|
||||
|
||||
/* No need to normalize new_rdn_type, attr_merge does it */
|
||||
|
||||
attr_merge( e, new_rdn_type, bvals );
|
||||
|
||||
} else {
|
||||
|
||||
|
||||
Debug( LDAP_DEBUG_TRACE, "ldbm_back_modrdn: DNS DN\n",
|
||||
0, 0, 0 );
|
||||
/* XXXV3: not sure of what to do here */
|
||||
Debug( LDAP_DEBUG_TRACE,\
|
||||
"ldbm_back_modrdn: not fully implemented...\n",
|
||||
0, 0, 0 );
|
||||
|
||||
}
|
||||
|
||||
(void) bdb2i_cache_update_entry( &li->li_cache, e );
|
||||
|
||||
/* id2entry index */
|
||||
if ( bdb2i_id2entry_add( be, e ) != 0 ) {
|
||||
entry_free( e );
|
||||
@ -177,13 +387,26 @@ bdb2i_back_modrdn_internal(
|
||||
rc = 0;
|
||||
|
||||
return_results:
|
||||
if( new_dn != NULL ) free( new_dn );
|
||||
if( new_ndn != NULL ) free( new_ndn );
|
||||
/* NOTE:
|
||||
* new_dn and new_ndn are not deallocated because they are used by
|
||||
* the cache entry.
|
||||
*/
|
||||
if( p_dn != NULL ) free( p_dn );
|
||||
if( p_ndn != NULL ) free( p_ndn );
|
||||
|
||||
if( matched != NULL ) free( matched );
|
||||
|
||||
/* LDAP v2 supporting correct attribute handling. */
|
||||
if( new_rdn_type != NULL ) free(new_rdn_type);
|
||||
if( new_rdn_val != NULL ) free(new_rdn_val);
|
||||
if( old_rdn != NULL ) free(old_rdn);
|
||||
if( old_rdn_type != NULL ) free(old_rdn_type);
|
||||
if( old_rdn_val != NULL ) free(old_rdn_val);
|
||||
|
||||
/* LDAP v3 Support */
|
||||
if ( np_dn != NULL ) free( np_dn );
|
||||
if ( np_ndn != NULL ) free( np_ndn );
|
||||
|
||||
if( p != NULL ) {
|
||||
/* free parent and writer lock */
|
||||
bdb2i_cache_return_entry_w( &li->li_cache, p );
|
||||
|
||||
Loading…
Reference in New Issue
Block a user