From 5d98bf319deb5d5c23e834a9984c784bc084d7cb Mon Sep 17 00:00:00 2001
From: abobrov <abobrov@localhost>
Date: Tue, 19 May 2009 15:53:55 +0000
Subject: [PATCH] - revert Revision: 5370 commit so that related changes land on the trunk from the branch instead of direct commit.
---
opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java | 45 +++++++++++++++++----------------------------
1 files changed, 17 insertions(+), 28 deletions(-)
diff --git a/opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java b/opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
index c88ec16..829d1e9 100644
--- a/opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
+++ b/opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
@@ -230,8 +230,24 @@
+ /*
+ * TODO Rename this method. Needs to be changed in SearchOperation. I
+ * find the name of the filterEntry method to be misleading because it
+ * works on a search operation but has nothing to do with the search
+ * filter. Something like "removeDisallowedAttributes" would be
+ * clearer.
+ */
+
/**
- * {@inheritDoc}
+ * Checks access on each attribute in an entry. It removes those
+ * attributes that fail access check.
+ *
+ * @param operation
+ * The search operation class containing information to check
+ * access on.
+ * @param entry
+ * The entry containing the attributes.
+ * @return The entry to return minus filtered attributes.
*/
@Override
public SearchResultEntry filterEntry(SearchOperation operation,
@@ -268,19 +284,6 @@
/**
* {@inheritDoc}
*/
- @Override
- public SearchResultEntry filterEntry(Operation operation, Entry entry)
- {
- AciLDAPOperationContainer operationContainer =
- new AciLDAPOperationContainer(operation, (ACI_READ), entry);
- return accessAllowedAttrs(operationContainer);
- }
-
-
-
- /**
- * {@inheritDoc}
- */
@Override()
public void finalizeAccessControlHandler()
{
@@ -558,20 +561,6 @@
* {@inheritDoc}
*/
@Override
- public boolean isAllowed(Operation operation, Entry entry,
- SearchFilter filter) throws DirectoryException
- {
- AciLDAPOperationContainer operationContainer =
- new AciLDAPOperationContainer(operation, (ACI_READ), entry);
- return testFilter(operationContainer, filter);
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- @Override
public boolean mayProxy(Entry proxyUser, Entry proxiedUser,
Operation op)
{
--
Gitblit v1.10.0