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/LengthBasedPasswordValidatorConfiguration.xml |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/opends/src/admin/defn/org/opends/server/admin/std/LengthBasedPasswordValidatorConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/LengthBasedPasswordValidatorConfiguration.xml
index 392994b..495a4d2 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/LengthBasedPasswordValidatorConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/LengthBasedPasswordValidatorConfiguration.xml
@@ -40,12 +40,11 @@
   </adm:synopsis>
   <adm:profile name="ldap">
     <ldap:object-class>
-      <ldap:oid>1.3.6.1.4.1.26027.1.2.59</ldap:oid>
       <ldap:name>ds-cfg-length-based-password-validator</ldap:name>
       <ldap:superior>ds-cfg-password-validator</ldap:superior>
     </ldap:object-class>
   </adm:profile>
-  <adm:property-override name="validator-class">
+  <adm:property-override name="java-class">
     <adm:default-behavior>
       <adm:defined>
         <adm:value>
@@ -54,7 +53,7 @@
       </adm:defined>
     </adm:default-behavior>
   </adm:property-override>
-  <adm:property name="maximum-password-length" mandatory="false">
+  <adm:property name="max-password-length" mandatory="false">
     <adm:synopsis>
       Specifies the maximum number of characters that may be included in a
       proposed password.
@@ -75,12 +74,11 @@
     </adm:syntax>
     <adm:profile name="ldap">
       <ldap:attribute>
-        <ldap:oid>1.3.6.1.4.1.26027.1.1.168</ldap:oid>
-        <ldap:name>ds-cfg-maximum-password-length</ldap:name>
+        <ldap:name>ds-cfg-max-password-length</ldap:name>
       </ldap:attribute>
     </adm:profile>
   </adm:property>
-  <adm:property name="minimum-password-length" mandatory="false">
+  <adm:property name="min-password-length" mandatory="false">
     <adm:synopsis>
       Specifies the minimum number of characters that must be included in a
       proposed password.
@@ -101,8 +99,7 @@
     </adm:syntax>
     <adm:profile name="ldap">
       <ldap:attribute>
-        <ldap:oid>1.3.6.1.4.1.26027.1.1.169</ldap:oid>
-        <ldap:name>ds-cfg-minimum-password-length</ldap:name>
+        <ldap:name>ds-cfg-min-password-length</ldap:name>
       </ldap:attribute>
     </adm:profile>
   </adm:property>

--
Gitblit v1.10.0