From f5a956ac0f445f81fa06ed1875253dec8e306f1a Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 12 Jul 2013 12:12:39 +0000
Subject: [PATCH] AciEvalContext.java, AciContainer.java: Removed instance member isDenyEval, setDecidingAci() and setEvalReason(), replaced with setEvaluationResult() since both are always set at the same time. Changed the impl of isDenyEval() to use the evalReason.
---
opends/src/server/org/opends/server/authorization/dseecompat/AciEffectiveRights.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/opends/src/server/org/opends/server/authorization/dseecompat/AciEffectiveRights.java b/opends/src/server/org/opends/server/authorization/dseecompat/AciEffectiveRights.java
index 616641b..6a6188c 100644
--- a/opends/src/server/org/opends/server/authorization/dseecompat/AciEffectiveRights.java
+++ b/opends/src/server/org/opends/server/authorization/dseecompat/AciEffectiveRights.java
@@ -29,6 +29,7 @@
package org.opends.server.authorization.dseecompat;
import static org.opends.server.authorization.dseecompat.Aci.*;
+
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
@@ -433,8 +434,7 @@
//another authzid or they don't have privs -- fall through.
if(skipCheck && container.isAuthzidAuthorizationDN()) {
resString.append("write").append(":1");
- container.setEvalReason(EnumEvalReason.SKIP_ACI);
- container.setDecidingAci(null);
+ container.setEvaluationResult(EnumEvalReason.SKIP_ACI, null);
createSummary(container, true, "main");
} else {
//Reset everything.
@@ -559,8 +559,7 @@
//another authzid or they don't have privs -- fall through.
if(skipCheck && container.isAuthzidAuthorizationDN()) {
resString.append(rightStr).append(":1");
- container.setEvalReason(EnumEvalReason.SKIP_ACI);
- container.setDecidingAci(null);
+ container.setEvaluationResult(EnumEvalReason.SKIP_ACI, null);
createSummary(container, true, "main");
} else {
boolean ret;
--
Gitblit v1.10.0