upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-27 09:09:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#3059: modrdn should delete than add.

Browse source
This commit is contained in:
Kurt Zeilenga 2004-04-06 21:06:35 +00:00
parent f7d8d55d84
commit 0c2c38c02f
1 changed files with 30 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
servers/slapd/back-ldbm/modrdn.c
View file

@ -614,28 +614,46 @@ ldbm_back_modrdn(
goto return_results;
}
/* add new one */
if ( dn2id_add( op->o_bd, &e->e_nname, e->e_id ) != 0 ) {
send_ldap_error( op, rs, LDAP_OTHER,
"DN index add failed" );
goto return_results;
}
/*
* NOTE: the backend MUST delete then add the entry,
* otherwise indexing may get hosed
* FIXME: if a new ID was used, the add could be done first.
* that would be safer.
*/
/* delete old one */
if ( dn2id_delete( op->o_bd, &old_ndn, e->e_id ) != 0 ) {
/* undo add of new one */
dn2id_delete( op->o_bd, &e->e_nname, e->e_id );
send_ldap_error( op, rs, LDAP_OTHER,
"DN index delete fail" );
goto return_results;
}
/* add new one */
if ( dn2id_add( op->o_bd, &e->e_nname, e->e_id ) != 0 ) {
/* try to repair old entry - probably hopeless */
if( dn2id_add( op->o_bd, &old_ndn, e->e_id) != 0 ) {
send_ldap_error( op, rs, LDAP_OTHER,
"DN index add and repair failed" );
} else {
send_ldap_error( op, rs, LDAP_OTHER,
"DN index add failed" );
}
goto return_results;
}
/* id2entry index */
if ( id2entry_add( op->o_bd, e ) != 0 ) {
/* Try to undo */
dn2id_delete( op->o_bd, &e->e_nname, e->e_id );
dn2id_add( op->o_bd, &old_ndn, e->e_id );
send_ldap_error( op, rs, LDAP_OTHER,
"entry update failed" );
int rc;
rc = dn2id_delete( op->o_bd, &e->e_nname, e->e_id );
rc |= dn2id_add( op->o_bd, &old_ndn, e->e_id );
if( rc ) {
send_ldap_error( op, rs, LDAP_OTHER,
"entry update and repair failed" );
} else {
send_ldap_error( op, rs, LDAP_OTHER,
"entry update failed" );
}
goto return_results;
}