From e7701dfe8076e2fe9aaf97611e298afa26009cbc Mon Sep 17 00:00:00 2001
From: dugan <dugan@localhost>
Date: Wed, 02 May 2007 02:02:04 +0000
Subject: [PATCH] Add ACI support for Get Effective Rights control. Issue #87.

---
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciTargets.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciTargets.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciTargets.java
index 0fd4984..8fd9d7b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciTargets.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciTargets.java
@@ -385,7 +385,7 @@
                      targAttrFilters.hasMask(TARGATTRFILTERS_ADD)) ||
                     (matchCtx.hasRights(ACI_WRITE_DELETE) &&
                     targAttrFilters.hasMask(TARGATTRFILTERS_DELETE)))
-                ret=targAttrFilters.isApplicableMod(matchCtx);
+                ret=targAttrFilters.isApplicableMod(matchCtx, aci);
         }
         return ret;
     }
@@ -423,7 +423,8 @@
                 else
                     ret = false;
             }
-            if((isFirstAttr) && (aci.getTargets().getTargetAttr() == null))
+            if((isFirstAttr) && (aci.getTargets().getTargetAttr() == null)
+                && aci.getTargets().getTargAttrFilters() == null)
                 targetMatchCtx.setEntryTestRule(true);
         }
         return ret;

--
Gitblit v1.10.0