Import ACL/parent locking changes from devel but define

SLAPD_CHILD_MODIFICATION_WITH_ENTRY_ACL to maintain current
behavior (need child write "entry" instead of parent write "children").
Fix Modrdn to use ACL.
In 1.2, this define should be removed.

diff --git a/servers/slapd/back-ldbm/delete.c b/servers/slapd/back-ldbm/delete.c
index 8511c140808e25a0c4230a3e254b69380c71d8c9..fa8eac72ad327f37420554f76119d8ddd72d6377 100644 (file)
--- a/servers/slapd/back-ldbm/delete.c
+++ b/servers/slapd/back-ldbm/delete.c
@@ -53,6 +53,7 @@ ldbm_back_delete(
                goto return_results;
        }
 
+#define SLAPD_CHILD_MODIFICATION_WITH_ENTRY_ACL 1
 #ifdef SLAPD_CHILD_MODIFICATION_WITH_ENTRY_ACL
        if ( ! access_allowed( be, conn, op, e, "entry", NULL, op->o_dn,
            ACL_WRITE ) ) {

diff --git a/servers/slapd/back-ldbm/modrdn.c b/servers/slapd/back-ldbm/modrdn.c
index ea8b2c4fba2084c403c180ddedd7d03dd4874c58..1a627e8ea5bddcc355a3bb1d67e68816d3991b1a 100644 (file)
--- a/servers/slapd/back-ldbm/modrdn.c
+++ b/servers/slapd/back-ldbm/modrdn.c
@@ -38,6 +38,7 @@ ldbm_back_modrdn(
                return( -1 );
        }
 
+#define SLAPD_CHILD_MODIFICATION_WITH_ENTRY_ACL 1
 #ifdef SLAPD_CHILD_MODIFICATION_WITH_ENTRY_ACL
                /* check parent for "children" acl */
        if ( ! access_allowed( be, conn, op, e, "entry", NULL,