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/ExternalSASLMechanismHandlerConfiguration.xml | 27 +++++++++++----------------
1 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/ExternalSASLMechanismHandlerConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/ExternalSASLMechanismHandlerConfiguration.xml
index 1e52dd9..96c36ec 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/ExternalSASLMechanismHandlerConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/ExternalSASLMechanismHandlerConfiguration.xml
@@ -40,13 +40,12 @@
<adm:profile name="ldap">
<ldap:object-class>
- <ldap:oid>1.3.6.1.4.1.26027.1.2.44</ldap:oid>
<ldap:name>ds-cfg-external-sasl-mechanism-handler</ldap:name>
<ldap:superior>ds-cfg-sasl-mechanism-handler</ldap:superior>
</ldap:object-class>
</adm:profile>
- <adm:property-override name="handler-class">
+ <adm:property-override name="java-class">
<adm:default-behavior>
<adm:defined>
<adm:value>
@@ -96,8 +95,7 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.22</ldap:oid>
- <ldap:name>ds-cfg-client-certificate-validation-policy</ldap:name>
+ <ldap:name>ds-cfg-certificate-validation-policy</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
@@ -123,29 +121,26 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.18</ldap:oid>
<ldap:name>ds-cfg-certificate-attribute</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
- <adm:property name="certificate-mapper-dn" mandatory="true">
+ <adm:property name="certificate-mapper" mandatory="true">
<adm:synopsis>
- Specifies the DN of the certificate mapper to use.
+ Specifies the name of the certificate mapper that should be used
+ to match client certificates to user entries.
</adm:synopsis>
- <adm:description>
- Specifies the DN of the configuration entry for the certificate mapper
- that should be used to match client certificates to user entries.
- </adm:description>
<adm:syntax>
- <adm:dn>
- <adm:base>cn=certificate mappers,cn=config</adm:base>
- </adm:dn>
+ <adm:aggregation relation-name="certificate-mapper"
+ parent-path="/">
+ <adm:source-enabled-property-name name="enabled" />
+ <adm:target-enabled-property-name name="enabled" />
+ </adm:aggregation>
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.309</ldap:oid>
- <ldap:name>ds-cfg-certificate-mapper-dn</ldap:name>
+ <ldap:name>ds-cfg-certificate-mapper</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
--
Gitblit v1.10.0