From 22094368c2865dcfb6daf8366425212b721a4657 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 05 Feb 2009 17:42:14 +0000
Subject: [PATCH] Merge ASN1 branch to trunk
---
opends/src/server/org/opends/server/core/BindOperationWrapper.java | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/BindOperationWrapper.java b/opends/src/server/org/opends/server/core/BindOperationWrapper.java
index 35d1d67..4734dec 100644
--- a/opends/src/server/org/opends/server/core/BindOperationWrapper.java
+++ b/opends/src/server/org/opends/server/core/BindOperationWrapper.java
@@ -28,13 +28,7 @@
import org.opends.messages.Message;
-import org.opends.server.protocols.asn1.ASN1OctetString;
-import org.opends.server.types.AuthenticationInfo;
-import org.opends.server.types.AuthenticationType;
-import org.opends.server.types.ByteString;
-import org.opends.server.types.DN;
-import org.opends.server.types.Entry;
-
+import org.opends.server.types.*;
/**
@@ -110,7 +104,7 @@
/**
* {@inheritDoc}
*/
- public ASN1OctetString getSASLCredentials()
+ public ByteString getSASLCredentials()
{
return bind.getSASLCredentials();
}
@@ -126,7 +120,7 @@
/**
* {@inheritDoc}
*/
- public ASN1OctetString getServerSASLCredentials()
+ public ByteString getServerSASLCredentials()
{
return bind.getServerSASLCredentials();
}
@@ -190,7 +184,7 @@
* {@inheritDoc}
*/
public void setSASLCredentials(String saslMechanism,
- ASN1OctetString saslCredentials)
+ ByteString saslCredentials)
{
bind.setSASLCredentials(saslMechanism, saslCredentials);
}
@@ -198,7 +192,7 @@
/**
* {@inheritDoc}
*/
- public void setServerSASLCredentials(ASN1OctetString serverSASLCredentials)
+ public void setServerSASLCredentials(ByteString serverSASLCredentials)
{
bind.setServerSASLCredentials(serverSASLCredentials);
}
--
Gitblit v1.10.0