From 3c20642b9c36426f66dfa034445c6bbf933ac9f1 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 14 Sep 2011 10:37:11 +0000
Subject: [PATCH] Fix OPENDJ-280: Add support for the LDAP sub-entry control as defined in draft-ietf-ldup-subentry
---
opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java b/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java
index 352502b..e9d6e30 100644
--- a/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java
+++ b/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java
@@ -47,15 +47,7 @@
import org.opends.server.core.SearchOperationWrapper;
import org.opends.server.core.SearchOperation;
import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.types.CanceledOperationException;
-import org.opends.server.types.Control;
-import org.opends.server.types.DebugLogLevel;
-import org.opends.server.types.DirectoryException;
-import org.opends.server.types.DN;
-import org.opends.server.types.Entry;
-import org.opends.server.types.Privilege;
-import org.opends.server.types.ResultCode;
-import org.opends.server.types.SearchFilter;
+import org.opends.server.types.*;
import org.opends.server.types.operation.PostOperationSearchOperation;
import org.opends.server.types.operation.PreOperationSearchOperation;
import org.opends.server.types.operation.SearchEntrySearchOperation;
@@ -518,6 +510,9 @@
else if (oid.equals(OID_LDUP_SUBENTRIES))
{
// Support for legacy draft-ietf-ldup-subentry.
+ addAdditionalLogItem(AdditionalLogItem.keyOnly(getClass(),
+ "obsoleteSubentryControl"));
+
setReturnSubentriesOnly(true);
}
else if (oid.equals(OID_MATCHED_VALUES))
--
Gitblit v1.10.0