From 70d594cec595cab0f430c0d1bdca41a2770cbfea Mon Sep 17 00:00:00 2001
From: Chris Ridd <chris.ridd@forgerock.com>
Date: Tue, 30 Oct 2012 17:38:23 +0000
Subject: [PATCH] Fix OPENDJ-618 DSML gateway should send an AuthResponse for the initial bind

---
 opends/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/opends/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java b/opends/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java
index d002525..e7325a2 100644
--- a/opends/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java
+++ b/opends/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java
@@ -454,7 +454,9 @@
    *          The object factory for this operation.
    * @param searchRequest
    *          The search request for this operation.
-   * @return The result of the add operation.
+   * @param controls
+   *          Any required controls (e.g. for proxy authz).
+   * @return The result of the search operation.
    * @throws IOException
    *           If an I/O problem occurs.
    * @throws LDAPException
@@ -462,7 +464,9 @@
    *           element.
    */
   public SearchResponse doSearch(ObjectFactory objFactory,
-      SearchRequest searchRequest) throws IOException, LDAPException
+      SearchRequest searchRequest,
+      List<org.opends.server.types.Control> controls)
+  throws IOException, LDAPException
   {
     SearchResponse searchResponse = objFactory.createSearchResponse();
     searchResponse.setRequestID(searchRequest.getRequestID());
@@ -514,7 +518,7 @@
     try
     {
       LDAPMessage msg =
-        new LDAPMessage(DSMLServlet.nextMessageID(), protocolOp);
+        new LDAPMessage(DSMLServlet.nextMessageID(), protocolOp, controls);
       connection.getLDAPWriter().writeMessage(msg);
 
       byte opType;

--
Gitblit v1.10.0