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/workflowelement/ndb/NDBSearchOperation.java | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/opends/src/server/org/opends/server/workflowelement/ndb/NDBSearchOperation.java b/opends/src/server/org/opends/server/workflowelement/ndb/NDBSearchOperation.java
index fcc42d3..690cbcc 100644
--- a/opends/src/server/org/opends/server/workflowelement/ndb/NDBSearchOperation.java
+++ b/opends/src/server/org/opends/server/workflowelement/ndb/NDBSearchOperation.java
@@ -304,6 +304,8 @@
try
{
+ // FIXME -- We need to determine whether the current user has
+ // permission to make this determination.
SearchFilter assertionFilter = assertControl.getSearchFilter();
Entry entry;
try
@@ -328,16 +330,6 @@
ERR_SEARCH_NO_SUCH_ENTRY_FOR_ASSERTION.get());
}
- // Check if the current user has permission to make
- // this determination.
- if (!AccessControlConfigManager.getInstance().
- getAccessControlHandler().isAllowed(this, entry, assertionFilter))
- {
- throw new DirectoryException(
- ResultCode.INSUFFICIENT_ACCESS_RIGHTS,
- ERR_CONTROL_INSUFFICIENT_ACCESS_RIGHTS.get(oid));
- }
-
if (! assertionFilter.matchesEntry(entry))
{
throw new DirectoryException(ResultCode.ASSERTION_FAILED,
--
Gitblit v1.10.0