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/admin/defn/org/opends/server/admin/std/AccessControlHandlerConfiguration.xml | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/AccessControlHandlerConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/AccessControlHandlerConfiguration.xml
index 3f1d9ee..5135e56 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/AccessControlHandlerConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/AccessControlHandlerConfiguration.xml
@@ -38,7 +38,6 @@
<adm:tag name="security"/>
<adm:profile name="ldap">
<ldap:object-class>
- <ldap:oid>1.3.6.1.4.1.26027.1.2.1</ldap:oid>
<ldap:name>ds-cfg-access-control-handler</ldap:name>
<ldap:superior>top</ldap:superior>
</ldap:object-class>
@@ -54,12 +53,11 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.2</ldap:oid>
- <ldap:name>ds-cfg-acl-handler-enabled</ldap:name>
+ <ldap:name>ds-cfg-enabled</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
- <adm:property name="acl-handler-class" mandatory="true">
+ <adm:property name="java-class" mandatory="true">
<adm:synopsis>
The fully-qualified name of the Java class that provides the
<adm:user-friendly-name />
@@ -74,8 +72,7 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.1</ldap:oid>
- <ldap:name>ds-cfg-acl-handler-class</ldap:name>
+ <ldap:name>ds-cfg-java-class</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
--
Gitblit v1.10.0