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/LDAPPasswordModify.java | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/LDAPPasswordModify.java b/opends/src/server/org/opends/server/tools/LDAPPasswordModify.java
index f126dc6..9b81f48 100644
--- a/opends/src/server/org/opends/server/tools/LDAPPasswordModify.java
+++ b/opends/src/server/org/opends/server/tools/LDAPPasswordModify.java
@@ -39,9 +39,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.asn1.ASN1Element;
import org.opends.server.protocols.asn1.ASN1OctetString;
-import org.opends.server.protocols.asn1.ASN1Reader;
import org.opends.server.protocols.asn1.ASN1Sequence;
-import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.protocols.ldap.ExtendedRequestProtocolOp;
import org.opends.server.protocols.ldap.ExtendedResponseProtocolOp;
import org.opends.server.protocols.ldap.LDAPControl;
@@ -619,8 +617,8 @@
return lce.getResultCode();
}
- ASN1Reader reader = connection.getASN1Reader();
- ASN1Writer writer = connection.getASN1Writer();
+ LDAPReader reader = connection.getLDAPReader();
+ LDAPWriter writer = connection.getLDAPWriter();
// Construct the password modify request.
@@ -677,7 +675,7 @@
// Send the request to the server and read the response.
try
{
- writer.writeElement(requestMessage.encode());
+ writer.writeMessage(requestMessage);
}
catch (Exception e)
{
@@ -689,7 +687,7 @@
{
requestMessage = new LDAPMessage(nextMessageID.getAndIncrement(),
new UnbindRequestProtocolOp());
- writer.writeElement(requestMessage.encode());
+ writer.writeMessage(requestMessage);
}
catch (Exception e2) {}
@@ -707,8 +705,7 @@
LDAPMessage responseMessage = null;
try
{
- ASN1Sequence responseSequence = reader.readElement().decodeAsSequence();
- responseMessage = LDAPMessage.decode(responseSequence);
+ responseMessage = reader.readMessage();
}
catch (Exception e)
{
@@ -720,7 +717,7 @@
{
requestMessage = new LDAPMessage(nextMessageID.getAndIncrement(),
new UnbindRequestProtocolOp());
- writer.writeElement(requestMessage.encode());
+ writer.writeMessage(requestMessage);
}
catch (Exception e2) {}
@@ -764,7 +761,7 @@
{
requestMessage = new LDAPMessage(nextMessageID.getAndIncrement(),
new UnbindRequestProtocolOp());
- writer.writeElement(requestMessage.encode());
+ writer.writeMessage(requestMessage);
}
catch (Exception e) {}
@@ -871,7 +868,7 @@
{
requestMessage = new LDAPMessage(nextMessageID.getAndIncrement(),
new UnbindRequestProtocolOp());
- writer.writeElement(requestMessage.encode());
+ writer.writeMessage(requestMessage);
}
catch (Exception e2) {}
@@ -891,7 +888,7 @@
{
requestMessage = new LDAPMessage(nextMessageID.getAndIncrement(),
new UnbindRequestProtocolOp());
- writer.writeElement(requestMessage.encode());
+ writer.writeMessage(requestMessage);
}
catch (Exception e) {}
--
Gitblit v1.10.0