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/protocols/jmx/JmxConnectionHandler.java | 32 ++------------------------------
1 files changed, 2 insertions(+), 30 deletions(-)
diff --git a/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java b/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java
index e2f2ffe..568be6a 100644
--- a/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java
+++ b/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java
@@ -48,7 +48,6 @@
import org.opends.server.api.AlertGenerator;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.ConnectionHandler;
-import org.opends.server.api.KeyManagerProvider;
import org.opends.server.api.ServerShutdownListener;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
@@ -324,20 +323,8 @@
public void initializeConnectionHandler(JMXConnectionHandlerCfg config)
throws ConfigException, InitializationException
{
- // Validate the key manager provider DN.
- DN keyManagerProviderDN = config.getKeyManagerProviderDN();
- if (keyManagerProviderDN != null) {
- KeyManagerProvider provider = DirectoryServer
- .getKeyManagerProvider(keyManagerProviderDN);
- if (provider == null) {
- Message message = ERR_JMX_CONNHANDLER_INVALID_KEYMANAGER_DN.get(
- String.valueOf(config.dn()), String.valueOf(keyManagerProviderDN));
- throw new ConfigException(message);
- }
- }
-
// Issue warning if there is not key manager by SSL is enabled.
- if (config.isUseSSL() && keyManagerProviderDN == null) {
+ if (config.isUseSSL() && config.getKeyManagerProvider() == null) {
// TODO: give a more useful feedback message.
Message message = ERR_JMX_CONNHANDLER_CANNOT_DETERMINE_USE_SSL.get(
String.valueOf(currentConfig.dn()), "");
@@ -441,23 +428,8 @@
List<Message> unacceptableReasons) {
boolean isAcceptable = true;
- // Validate the key manager provider DN.
- DN keyManagerProviderDN = config.getKeyManagerProviderDN();
- if (keyManagerProviderDN != null) {
- KeyManagerProvider provider = DirectoryServer
- .getKeyManagerProvider(keyManagerProviderDN);
- if (provider == null) {
-
- unacceptableReasons.add(ERR_JMX_CONNHANDLER_INVALID_KEYMANAGER_DN.get(
- String.valueOf(config.dn()),
- String.valueOf(keyManagerProviderDN)));
- isAcceptable = false;
- }
- }
-
- if (config.isUseSSL() && keyManagerProviderDN == null) {
+ if (config.isUseSSL() && config.getKeyManagerProvider() == null) {
// TODO: give a more useful feedback message.
-
unacceptableReasons.add(ERR_JMX_CONNHANDLER_CANNOT_DETERMINE_USE_SSL.get(
String.valueOf(config.dn()), ""));
isAcceptable = false;
--
Gitblit v1.10.0