mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-03 02:41:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#1430 fixes from HEAD

Browse Source
This commit is contained in:
Kurt Zeilenga 2001-11-13 19:41:50 +00:00
parent 06567ee554
commit 5da989414f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
servers/slapd/back-ldbm/delete.c
View File

@ -93,7 +93,7 @@ ldbm_back_delete(
}
/* delete from parent's id2children entry */
if( (pdn = dn_parent( be, e->e_ndn )) != NULL ) {
if( (pdn = dn_parent( be, e->e_ndn )) != NULL && pdn[ 0 ] != '\0' ) {
if( (p = dn2entry_w( be, pdn, NULL )) == NULL) {
Debug( LDAP_DEBUG_TRACE,
"<=- ldbm_back_delete: parent does not exist\n",
@ -117,7 +117,7 @@ ldbm_back_delete(
} else {
/* no parent, must be root to delete */
if( ! be_isroot( be, op->o_ndn ) ) {
if( ! be_isroot( be, op->o_ndn ) && ! be_issuffix( be, "" ) ) {
Debug( LDAP_DEBUG_TRACE,
"<=- ldbm_back_delete: no parent & not root\n",
0, 0, 0);

8
servers/slapd/back-ldbm/modrdn.c
View File

@ -373,8 +373,8 @@ ldbm_back_modrdn(
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, &val, ACL_WRITE ) ) {
Debug( LDAP_DEBUG_TRACE,
"ldbm_back_modrdn: access not allowed "
"to attr \"%s\"\n%s%s",
@ -431,8 +431,8 @@ ldbm_back_modrdn(
val.bv_val = old_rdn_vals[d_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, &val, ACL_WRITE ) ) {
Debug( LDAP_DEBUG_TRACE,
"ldbm_back_modrdn: access not allowed "
"to attr \"%s\"\n%s%s",