From 4287153a2c0323d20e6619c4ea52fa8057ff946d Mon Sep 17 00:00:00 2001
From: coulbeck <coulbeck@localhost>
Date: Wed, 25 Jul 2007 17:31:32 +0000
Subject: [PATCH] Fix for issue #1015: ldapsearch --verbose option doesn't work. This change causes ldapsearch and ldapmodify verbose options to trace the contents of incoming and outgoing LDAP messages and ASN.1 elements to standard error stream. It excludes search-result-entry messages from the trace since this would be rather too verbose and not very useful. The main use for verbose output is to investigate connection problems, referral following and such. A possible improvement would be to use a separate option for the ASN.1 tracing, and add session related output such as connection details, security context details and auth details as well as referral chasing details (all this must currently be derived from the protocol trace).
---
opends/src/server/org/opends/server/tools/LDAPDelete.java | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/LDAPDelete.java b/opends/src/server/org/opends/server/tools/LDAPDelete.java
index 89f7b82..860bac8 100644
--- a/opends/src/server/org/opends/server/tools/LDAPDelete.java
+++ b/opends/src/server/org/opends/server/tools/LDAPDelete.java
@@ -38,10 +38,8 @@
import java.util.concurrent.atomic.AtomicInteger;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.protocols.asn1.ASN1Element;
import org.opends.server.protocols.asn1.ASN1Exception;
import org.opends.server.protocols.asn1.ASN1OctetString;
-import org.opends.server.protocols.asn1.ASN1Sequence;
import org.opends.server.protocols.ldap.DeleteRequestProtocolOp;
import org.opends.server.protocols.ldap.DeleteResponseProtocolOp;
import org.opends.server.protocols.ldap.LDAPControl;
@@ -193,11 +191,8 @@
LDAPMessage responseMessage = null;
try
{
- int numBytes =
- connection.getASN1Writer().writeElement(message.encode());
- ASN1Element element = connection.getASN1Reader().readElement();
- responseMessage = LDAPMessage.decode(
- ASN1Sequence.decodeAsSequence(element));
+ connection.getLDAPWriter().writeMessage(message);
+ responseMessage = connection.getLDAPReader().readMessage();
} catch(ASN1Exception ae)
{
if (debugEnabled())
--
Gitblit v1.10.0