From ee1525512e6bb867b39045abfd69949401a6d0fb Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Wed, 13 Jan 1999 21:11:36 +0000 Subject: [PATCH] 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. --- servers/slapd/back-ldbm/delete.c | 1 + servers/slapd/back-ldbm/modrdn.c | 1 + 2 files changed, 2 insertions(+) diff --git a/servers/slapd/back-ldbm/delete.c b/servers/slapd/back-ldbm/delete.c index 8511c14080..fa8eac72ad 100644 --- 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 ea8b2c4fba..1a627e8ea5 100644 --- 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, -- 2.47.2