From 5ceb2e9601d2501d021d0c61188ec913076555a0 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Wed, 26 Sep 2007 12:21:02 +0000
Subject: [PATCH] Merge branches/temp-admin@3208 onto trunk@3208.
---
opends/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java | 60 +++++-------------------------------------------------------
1 files changed, 5 insertions(+), 55 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java b/opends/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java
index cc0e904..a176cfe 100644
--- a/opends/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java
+++ b/opends/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java
@@ -99,11 +99,8 @@
// The current configuration for this SASL mechanism handler.
private CramMD5SASLMechanismHandlerCfg currentConfig;
- // The DN of the configuration entry for this SASL mechanism handler.
- private DN configEntryDN;
-
// The identity mapper that will be used to map ID strings to user entries.
- private IdentityMapper identityMapper;
+ private IdentityMapper<?> identityMapper;
// The message digest engine that will be used to create the MD5 digests.
private MessageDigest md5Digest;
@@ -139,10 +136,7 @@
throws ConfigException, InitializationException
{
configuration.addCramMD5ChangeListener(this);
-
currentConfig = configuration;
- configEntryDN = configuration.dn();
-
// Initialize the variables needed for the MD5 digest creation.
digestLock = new Object();
@@ -175,13 +169,6 @@
// Get the identity mapper that should be used to find users.
DN identityMapperDN = configuration.getIdentityMapperDN();
identityMapper = DirectoryServer.getIdentityMapper(identityMapperDN);
- if (identityMapper == null)
- {
- Message message = ERR_SASLCRAMMD5_NO_SUCH_IDENTITY_MAPPER.get(
- String.valueOf(identityMapperDN), String.valueOf(configEntryDN));
- throw new ConfigException(message);
- }
-
DirectoryServer.registerSASLMechanismHandler(SASL_MECHANISM_CRAM_MD5, this);
}
@@ -621,23 +608,7 @@
CramMD5SASLMechanismHandlerCfg configuration,
List<Message> unacceptableReasons)
{
- boolean configAcceptable = true;
- DN cfgEntryDN = configuration.dn();
-
- // Get the identity mapper that should be used to find users.
- DN identityMapperDN = configuration.getIdentityMapperDN();
- IdentityMapper newIdentityMapper =
- DirectoryServer.getIdentityMapper(identityMapperDN);
- if (newIdentityMapper == null)
- {
- unacceptableReasons.add(ERR_SASLCRAMMD5_NO_SUCH_IDENTITY_MAPPER.get(
- String.valueOf(identityMapperDN),
- String.valueOf(cfgEntryDN)));
- configAcceptable = false;
- }
-
-
- return configAcceptable;
+ return true;
}
@@ -652,32 +623,11 @@
boolean adminActionRequired = false;
ArrayList<Message> messages = new ArrayList<Message>();
-
- // Get the identity mapper that should be used to find users.
DN identityMapperDN = configuration.getIdentityMapperDN();
- IdentityMapper newIdentityMapper =
- DirectoryServer.getIdentityMapper(identityMapperDN);
- if (newIdentityMapper == null)
- {
- if (resultCode == ResultCode.SUCCESS)
- {
- resultCode = ResultCode.CONSTRAINT_VIOLATION;
- }
+ identityMapper = DirectoryServer.getIdentityMapper(identityMapperDN);
+ currentConfig = configuration;
- messages.add(ERR_SASLCRAMMD5_NO_SUCH_IDENTITY_MAPPER.get(
- String.valueOf(identityMapperDN),
- String.valueOf(configEntryDN)));
- }
-
-
- if (resultCode == ResultCode.SUCCESS)
- {
- identityMapper = newIdentityMapper;
- currentConfig = configuration;
- }
-
-
- return new ConfigChangeResult(resultCode, adminActionRequired, messages);
+ return new ConfigChangeResult(resultCode, adminActionRequired, messages);
}
}
--
Gitblit v1.10.0