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/ExternalSASLMechanismHandler.java | 49 ++-----------------------------------------------
1 files changed, 2 insertions(+), 47 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java b/opends/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java
index d166374..012f84f 100644
--- a/opends/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java
+++ b/opends/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java
@@ -91,9 +91,6 @@
// client with a certificate in the user's entry.
private CertificateValidationPolicy validationPolicy;
- // The DN of the configuration entry for this SASL mechanism handler.
- private DN configEntryDN;
-
// The current configuration for this SASL mechanism handler.
private ExternalSASLMechanismHandlerCfg currentConfig;
@@ -120,10 +117,7 @@
throws ConfigException, InitializationException
{
configuration.addExternalChangeListener(this);
-
currentConfig = configuration;
- configEntryDN = configuration.dn();
-
// See if we should attempt to validate client certificates against those in
// the corresponding user's entry.
@@ -152,19 +146,6 @@
}
- // Make sure that the configured certificate mapper is valid.
- CertificateMapper certificateMapper =
- DirectoryServer.getCertificateMapper(
- configuration.getCertificateMapperDN());
- if (certificateMapper == null)
- {
- Message message = ERR_SASLEXTERNAL_INVALID_CERTIFICATE_MAPPER_DN.
- get(String.valueOf(configEntryDN),
- String.valueOf(configuration.getCertificateMapperDN()));
- throw new ConfigException(message);
- }
-
-
DirectoryServer.registerSASLMechanismHandler(SASL_MECHANISM_EXTERNAL, this);
}
@@ -250,18 +231,8 @@
// Get the certificate mapper to use to map the certificate to a user entry.
DN certificateMapperDN = config.getCertificateMapperDN();
- CertificateMapper certificateMapper =
+ CertificateMapper<?> certificateMapper =
DirectoryServer.getCertificateMapper(certificateMapperDN);
- if (certificateMapper == null)
- {
- bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
-
- Message message = ERR_SASLEXTERNAL_INVALID_CERTIFICATE_MAPPER_DN.get(
- String.valueOf(configEntryDN),
- String.valueOf(certificateMapperDN));
- bindOperation.setAuthFailureReason(message);
- return;
- }
// Use the Directory Server certificate mapper to map the client certificate
@@ -469,23 +440,7 @@
ExternalSASLMechanismHandlerCfg configuration,
List<Message> unacceptableReasons)
{
- boolean configAcceptable = true;
- DN cfgEntryDN = configuration.dn();
-
- // Make sure that the configured certificate mapper is valid.
- CertificateMapper certificateMapper =
- DirectoryServer.getCertificateMapper(
- configuration.getCertificateMapperDN());
- if (certificateMapper == null)
- {
- unacceptableReasons.add(ERR_SASLEXTERNAL_INVALID_CERTIFICATE_MAPPER_DN
- .get(String.valueOf(cfgEntryDN),
- String.valueOf(configuration.getCertificateMapperDN())));
- configAcceptable = false;
- }
-
-
- return configAcceptable;
+ return true;
}
--
Gitblit v1.10.0