From f3186148daf2a3fead3fdf20e92b7cb14464f74a Mon Sep 17 00:00:00 2001
From: coulbeck <coulbeck@localhost>
Date: Thu, 15 Mar 2007 18:50:44 +0000
Subject: [PATCH] Fix some more TODOs in the ACI.
---
opends/src/server/org/opends/server/authorization/dseecompat/EnumAuthMethod.java | 65 +++++---------------------------
1 files changed, 10 insertions(+), 55 deletions(-)
diff --git a/opends/src/server/org/opends/server/authorization/dseecompat/EnumAuthMethod.java b/opends/src/server/org/opends/server/authorization/dseecompat/EnumAuthMethod.java
index 7f3fe72..7e170fd 100644
--- a/opends/src/server/org/opends/server/authorization/dseecompat/EnumAuthMethod.java
+++ b/opends/src/server/org/opends/server/authorization/dseecompat/EnumAuthMethod.java
@@ -26,17 +26,7 @@
*/
package org.opends.server.authorization.dseecompat;
-/*
- * TODO Evaluate moving this to a non-enumeration class that can add
- * SASL mechanisms dynamically.
- *
- * Given our previous discussion about needing to support any kind of SASL
- * mechanism that may be registered with the server, perhaps an enum isn't
- * the right way to handle this because we don't know ahead of time what
- * auth methods might be available (certainly not at compile time, but
- * potentially not even at runtime since I can add support for a new SASL
- * mechanism on the fly without restarting the server).
- */
+
/**
* This class provides an enumeration of the allowed authmethod types.
*/
@@ -47,35 +37,24 @@
* none.
*/
AUTHMETHOD_NONE ("none"),
+
/**
- * The enumeration type when the bind rule has specified authentication of
- * simple.
+ * The enumeration type when the bind rule has specified authentication of
+ * simple.
*/
AUTHMETHOD_SIMPLE ("simple"),
+
/**
- * The enumeration type when the bind rule has specified authentication of
- * ssl client auth.
+ * The enumeration type when the bind rule has specified authentication of
+ * ssl client auth.
*/
AUTHMETHOD_SSL ("ssl"),
+
/**
* The enumeration type when the bind rule has specified authentication of
- * sasl DIGEST-MD5.
+ * a sasl mechanism.
*/
- AUTHMETHOD_SASL_MD5 ("sasl DIGEST-MD5"),
- /**
- * The enumeration type when the bind rule has specified authentication of
- * sasl EXTERNAL.
- */
- AUTHMETHOD_SASL_EXTERNAL ("sasl EXTERNAL"),
- /**
- * The enumeration type when the bind rule has specified authentication of
- * sasl GSSAPI.
- */
- AUTHMETHOD_SASL_GSSAPI ("sasl GSSAPI"),
- /**
- * Special internal enumeration for when there is no match.
- */
- AUTHMETHOD_NOMATCH ("nomatch");
+ AUTHMETHOD_SASL ("sasl");
/*
* The name of the authmethod.
@@ -90,28 +69,4 @@
this.authmethod = authmethod;
}
- /**
- * Checks if a authmethod name is equal to this enumeration.
- * @param myauthmethod The name to test for.
- * @return True if the names match.
- */
- public boolean isAuthMethod(String myauthmethod){
- return myauthmethod.equalsIgnoreCase(this.authmethod);
- }
-
- /**
- * Creates an authmethod enumeration from the name passed in.
- * @param myauthmethod The name to create.
- * @return An authmethod enumeration if the name was found or null if not.
- */
- public static EnumAuthMethod createAuthmethod(String myauthmethod){
- if (myauthmethod != null){
- for (EnumAuthMethod t : EnumAuthMethod.values()){
- if (t.isAuthMethod(myauthmethod)){
- return t;
- }
- }
- }
- return null;
- }
}
--
Gitblit v1.10.0