New access_allowed()

[openldap] / servers / slapd / back-shell / modrdn.c

diff --git a/servers/slapd/back-shell/modrdn.c b/servers/slapd/back-shell/modrdn.c
index 93bcc59b900ab13d868bd40c518739c1e447bffa..bde9e522c0b058b00882e7ad3b0d5849dbf3c654 100644 (file)
--- a/servers/slapd/back-shell/modrdn.c
+++ b/servers/slapd/back-shell/modrdn.c
@@ -44,9 +44,9 @@ shell_back_modrdn(
     SlapReply  *rs )
 {
        struct shellinfo        *si = (struct shellinfo *) op->o_bd->be_private;
-       AttributeDescription *entry = slap_schema.si_ad_entry;
        Entry e;
        FILE                    *rfp, *wfp;
+       AclCheck        ak = { &e, slap_schema.si_ad_entry, NULL, ACL_WRITE, NULL };
 
        if ( si->si_modrdn == NULL ) {
                send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
@@ -63,9 +63,9 @@ shell_back_modrdn(
        e.e_bv.bv_val = NULL;
        e.e_private = NULL;
 
-       if ( ! access_allowed( op, &e, entry, NULL,
-                       op->oq_modrdn.rs_newSup ? ACL_WDEL : ACL_WRITE,
-                       NULL ) )
+
+       if ( op->oq_modrdn.rs_newSup ) ak.ak_access = ACL_WDEL;
+       if ( ! access_allowed( op, &ak ))
        {
                send_ldap_error( op, rs, LDAP_INSUFFICIENT_ACCESS, NULL );
                return -1;