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/AciEvalContext.java | 29 +++++++++--------------------
1 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/opends/src/server/org/opends/server/authorization/dseecompat/AciEvalContext.java b/opends/src/server/org/opends/server/authorization/dseecompat/AciEvalContext.java
index 751aba7..6901fd6 100644
--- a/opends/src/server/org/opends/server/authorization/dseecompat/AciEvalContext.java
+++ b/opends/src/server/org/opends/server/authorization/dseecompat/AciEvalContext.java
@@ -74,12 +74,6 @@
public List<Aci> getAllowList();
/**
- * Set when the deny list is being evaluated.
- * @param v True if deny's are being evaluated.
- */
- public void setDenyEval(boolean v);
-
- /**
* Returns true if the deny list is being evaluated.
* @return True if the deny list is being evaluated.
*/
@@ -217,14 +211,17 @@
public void setTargAttrFiltersMatchOp(int flag);
/**
- * Set the reason the last access evaluation was evaluated the way it
- * was. Used by geteffectiverights control evaluation to eventually build the
- * summary string.
+ * Set the reason and the ACI that decided why the last access evaluation was
+ * evaluated the way it was. Used by geteffectiverights control evaluation to
+ * eventually build the summary string.
*
- * @param reason The enumeration representing the reason of the last access
- * evaluation.
+ * @param reason
+ * The enumeration representing the reason of the last access
+ * evaluation.
+ * @param decidingAci
+ * The ACI that decided the last access evaluation.
*/
- public void setEvalReason(EnumEvalReason reason);
+ void setEvaluationResult(EnumEvalReason reason, Aci decidingAci);
/**
* Return the reason the last access evaluation was evaluated the way it
@@ -237,14 +234,6 @@
public EnumEvalReason getEvalReason();
/**
- * Set the ACI that decided that last access evaluation. Used by
- * geteffectiverights control evaluation to the build summary string.
- *
- * @param aci The ACI that decided the last access evaluation.
- */
- public void setDecidingAci(Aci aci);
-
- /**
* Check if an evaluation context contains a set of access rights.
*
* @param rights The rights mask to check.
--
Gitblit v1.10.0