From 67405dde9ba213331dab1fc46cb18c485070fd5b Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 05 Jun 2009 09:04:50 +0000
Subject: [PATCH] svn merge -r5333:5417 https://opends.dev.java.net/svn/opends/branches/b2.0

---
 opends/src/server/org/opends/server/core/DefaultAccessControlHandler.java |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/opends/src/server/org/opends/server/core/DefaultAccessControlHandler.java b/opends/src/server/org/opends/server/core/DefaultAccessControlHandler.java
index c634bd2..c5c888a 100644
--- a/opends/src/server/org/opends/server/core/DefaultAccessControlHandler.java
+++ b/opends/src/server/org/opends/server/core/DefaultAccessControlHandler.java
@@ -22,7 +22,7 @@
  * CDDL HEADER END
  *
  *
- *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Copyright 2006-2009 Sun Microsystems, Inc.
  */
 package org.opends.server.core;
 
@@ -192,6 +192,18 @@
    * {@inheritDoc}
    */
   @Override
+  public boolean isAllowed(Operation operation, Entry entry,
+    SearchFilter filter) throws DirectoryException
+  {
+    return true;
+  }
+
+
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
   public boolean maySend(SearchOperation searchOperation,
                          SearchResultEntry searchEntry)
   {
@@ -216,6 +228,18 @@
    * {@inheritDoc}
    */
   @Override
+  public SearchResultEntry filterEntry(Operation operation, Entry entry)
+  {
+    // No implementation required.
+    return new SearchResultEntry(entry);
+  }
+
+
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
   public boolean maySend(DN dn, SearchOperation searchOperation,
                          SearchResultReference searchReference)
   {

--
Gitblit v1.10.0