From fe19ac2d6f1b978356b29e81901b91ae7a09daf9 Mon Sep 17 00:00:00 2001
From: Chris Ridd <chris.ridd@forgerock.com>
Date: Fri, 02 Oct 2015 12:39:01 +0000
Subject: [PATCH] OPENDJ-2312 Check rightsMask for all operations in setEval{User,Op}Attributes

---
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciContainer.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciContainer.java
index 69a2ee9..4477aeb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciContainer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciContainer.java
@@ -805,7 +805,7 @@
   /** {@inheritDoc} */
   @Override
   public  void setEvalUserAttributes(int v) {
-    if(operation instanceof SearchOperation && rightsMask == ACI_READ) {
+    if(rightsMask == ACI_READ) {
       if(v == ACI_FOUND_USER_ATTR_RULE) {
         evalAllAttributes |= ACI_FOUND_USER_ATTR_RULE;
         evalAllAttributes &= ~ACI_USER_ATTR_STAR_MATCHED;
@@ -820,7 +820,7 @@
   /** {@inheritDoc} */
   @Override
   public  void setEvalOpAttributes(int v) {
-    if(operation instanceof SearchOperation && rightsMask == ACI_READ) {
+    if(rightsMask == ACI_READ) {
       if(v == ACI_FOUND_OP_ATTR_RULE) {
         evalAllAttributes |= ACI_FOUND_OP_ATTR_RULE;
         evalAllAttributes &= ~ACI_OP_ATTR_PLUS_MATCHED;

--
Gitblit v1.10.0