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/localbackend/LocalBackendAddOperation.java | 27 +++++++--------------------
1 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java b/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java
index 118297f..bb0ace1 100644
--- a/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java
+++ b/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java
@@ -1464,26 +1464,14 @@
if (oid.equals(OID_LDAP_ASSERTION))
{
- // RFC 4528 mandates support for Add operation basically
- // suggesting an asertion on self. As daft as it may be
- // we gonna have to support this for RFC compliance.
LDAPAssertionRequestControl assertControl =
getRequestControl(LDAPAssertionRequestControl.DECODER);
try
{
+ // FIXME -- We need to determine whether the current user has
+ // permission to make this determination.
SearchFilter filter = assertControl.getSearchFilter();
-
- // Check if the current user has permission to make
- // this determination.
- if (!AccessControlConfigManager.getInstance().
- getAccessControlHandler().isAllowed(this, entry, filter))
- {
- throw new DirectoryException(
- ResultCode.INSUFFICIENT_ACCESS_RIGHTS,
- ERR_CONTROL_INSUFFICIENT_ACCESS_RIGHTS.get(oid));
- }
-
if (! filter.matchesEntry(entry))
{
throw new DirectoryException(ResultCode.ASSERTION_FAILED,
@@ -1632,13 +1620,12 @@
}
}
- // Check access controls on the entry and strip out
- // any not allowed attributes.
- SearchResultEntry searchEntry =
- AccessControlConfigManager.getInstance().
- getAccessControlHandler().filterEntry(this, addedEntry);
+ // FIXME -- Check access controls on the entry to see if it should
+ // be returned or if any attributes need to be stripped
+ // out..
+ SearchResultEntry searchEntry = new SearchResultEntry(addedEntry);
LDAPPostReadResponseControl responseControl =
- new LDAPPostReadResponseControl(searchEntry);
+ new LDAPPostReadResponseControl(searchEntry);
addResponseControl(responseControl);
}
}
--
Gitblit v1.10.0