Port ITS#1430 changes from ldbm

diff --git a/servers/slapd/back-bdb/delete.c b/servers/slapd/back-bdb/delete.c
index 550c476b91e48813bf7eb748c0c5d5cc7852c7be..1aa089e66cabd8d9be984b07e38061cb4f039535 100644 (file)
--- a/servers/slapd/back-bdb/delete.c
+++ b/servers/slapd/back-bdb/delete.c
@@ -162,7 +162,7 @@ retry:      /* transaction retry */
                ch_free( pdn );
 
                /* 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,
                                "<=- bdb_delete: no parent and not root\n",
                                0, 0, 0);

diff --git a/servers/slapd/back-bdb/modrdn.c b/servers/slapd/back-bdb/modrdn.c
index 1707a54026f149cae97383a63b0b6b344f0d4146..bc183cb9fa3a4b3d640ca59bbfbc919c453b2f91 100644 (file)
--- a/servers/slapd/back-bdb/modrdn.c
+++ b/servers/slapd/back-bdb/modrdn.c
@@ -391,7 +391,7 @@ retry:      /* transaction retry */
                /* 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, p, 
+               if ( !access_allowed( be, conn, op, e, 
                                desc, &val, ACL_WRITE ) ) {
                        Debug( LDAP_DEBUG_TRACE,
                                "bdb_modrdn: access to attr \"%s\" "
@@ -443,7 +443,7 @@ retry:      /* transaction retry */
                        /* 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, p, 
+                       if ( !access_allowed( be, conn, op, e, 
                                        desc, &val, ACL_WRITE ) ) {
                                Debug( LDAP_DEBUG_TRACE,
                                        "bdb_modrdn: access to attr \"%s\" "