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/BindOperation.java | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/BindOperation.java b/opends/src/server/org/opends/server/core/BindOperation.java
index 13ee216..3f93ea0 100644
--- a/opends/src/server/org/opends/server/core/BindOperation.java
+++ b/opends/src/server/org/opends/server/core/BindOperation.java
@@ -27,13 +27,7 @@
package org.opends.server.core;
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.Operation;
+import org.opends.server.types.*;
/**
@@ -132,7 +126,7 @@
* @return The SASL credentials for this bind operation, or <CODE>null</CODE>
* if there are none or if the bind does not use SASL authentication.
*/
- public abstract ASN1OctetString getSASLCredentials();
+ public abstract ByteString getSASLCredentials();
/**
* Specifies the SASL credentials for this bind operation.
@@ -142,7 +136,7 @@
* <CODE>null</CODE> if there are none.
*/
public abstract void setSASLCredentials(String saslMechanism,
- ASN1OctetString saslCredentials);
+ ByteString saslCredentials);
/**
* Retrieves the set of server SASL credentials to include in the bind
@@ -151,7 +145,7 @@
* @return The set of server SASL credentials to include in the bind
* response, or <CODE>null</CODE> if there are none.
*/
- public abstract ASN1OctetString getServerSASLCredentials();
+ public abstract ByteString getServerSASLCredentials();
/**
* Specifies the set of server SASL credentials to include in the bind
@@ -161,7 +155,7 @@
* include in the bind response.
*/
public abstract void setServerSASLCredentials(
- ASN1OctetString serverSASLCredentials);
+ ByteString serverSASLCredentials);
/**
* Retrieves the user entry associated with the SASL authentication attempt.
--
Gitblit v1.10.0