From b08bd4dd4b0d4d17d4907c605dba11020cf11922 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 28 Sep 2007 15:47:50 +0000
Subject: [PATCH] Add support for specifying arbitrary constraints in managed object definitions and use it within the LDAP and JMX connection handlers to enforce their SSL/StartTLS settings. This feature will be re-used for other managed object definitions as the need arises.

---
 opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java |   21 ++-------------------
 1 files changed, 2 insertions(+), 19 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 568be6a..6ac3305 100644
--- a/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java
+++ b/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java
@@ -323,15 +323,6 @@
   public void initializeConnectionHandler(JMXConnectionHandlerCfg config)
          throws ConfigException, InitializationException
   {
-    // Issue warning if there is not key manager by SSL is enabled.
-    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()), "");
-      logError(message);
-      throw new ConfigException(message);
-    }
-
     // Configuration is ok.
     currentConfig = config;
 
@@ -426,16 +417,8 @@
   public boolean isConfigurationChangeAcceptable(
       JMXConnectionHandlerCfg config,
       List<Message> unacceptableReasons) {
-    boolean isAcceptable = true;
-
-    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;
-    }
-
-    return isAcceptable;
+    // All validation is performed by the admin framework.
+    return true;
   }
 
 

--
Gitblit v1.10.0