From c6bdf5ea46f63b21dd0582c6ce8662239c41b9bc Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Thu, 19 Apr 2007 12:01:04 +0000
Subject: [PATCH] Fix 1525 (Cannot disable access control handler)
---
opends/src/server/org/opends/server/core/DefaultAccessControlProvider.java | 3 ++-
opends/src/server/org/opends/server/core/AccessControlConfigManager.java | 7 +++++++
2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/AccessControlConfigManager.java b/opends/src/server/org/opends/server/core/AccessControlConfigManager.java
index 36261b2..8e90044 100644
--- a/opends/src/server/org/opends/server/core/AccessControlConfigManager.java
+++ b/opends/src/server/org/opends/server/core/AccessControlConfigManager.java
@@ -221,8 +221,15 @@
if (newHandlerClass != null) {
AccessControlProvider<? extends AccessControlHandlerCfg> newHandler ;
try {
+ if (newConfiguration.isEnabled())
+ {
newHandler = loadProvider(newHandlerClass.getName(), newConfiguration
.getConfiguration());
+ }
+ else
+ {
+ newHandler = new DefaultAccessControlProvider();
+ }
} catch (Exception e) {
if (debugEnabled())
{
diff --git a/opends/src/server/org/opends/server/core/DefaultAccessControlProvider.java b/opends/src/server/org/opends/server/core/DefaultAccessControlProvider.java
index 6e0bec0..a8122ef 100644
--- a/opends/src/server/org/opends/server/core/DefaultAccessControlProvider.java
+++ b/opends/src/server/org/opends/server/core/DefaultAccessControlProvider.java
@@ -43,7 +43,8 @@
* access control is disabled and implements a default access control
* decision function which grants access to everything and anyone.
*/
-class DefaultAccessControlProvider implements AccessControlProvider {
+class DefaultAccessControlProvider
+ implements AccessControlProvider <AccessControlHandlerCfg> {
/**
* The single handler instance.
--
Gitblit v1.10.0