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

diff --git a/opends/src/admin/defn/org/opends/server/admin/std/RandomPasswordGeneratorConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/RandomPasswordGeneratorConfiguration.xml
index 4ada33f..c732ad1 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/RandomPasswordGeneratorConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/RandomPasswordGeneratorConfiguration.xml
@@ -39,12 +39,11 @@
   </adm:synopsis>
   <adm:profile name="ldap">
     <ldap:object-class>
-      <ldap:oid>1.3.6.1.4.1.26027.1.2.61</ldap:oid>
       <ldap:name>ds-cfg-random-password-generator</ldap:name>
       <ldap:superior>ds-cfg-password-generator</ldap:superior>
     </ldap:object-class>
   </adm:profile>
-  <adm:property-override name="generator-class">
+  <adm:property-override name="java-class">
     <adm:default-behavior>
       <adm:defined>
         <adm:value>
@@ -72,7 +71,6 @@
     </adm:syntax>
     <adm:profile name="ldap">
       <ldap:attribute>
-        <ldap:oid>1.3.6.1.4.1.26027.1.1.170</ldap:oid>
         <ldap:name>ds-cfg-password-character-set</ldap:name>
       </ldap:attribute>
     </adm:profile>
@@ -85,7 +83,7 @@
       Specifies the format to use for the generated password. The value
       is a comma-delimited list of elements in which each of those
       elements is comprised of the name of a character set defined in
-      the ds-cfg-password-character- set attribute, a colon, and the
+      the ds-cfg-password-character-set attribute, a colon, and the
       number of characters to include from that set. For example, a
       value of "alpha:3,numeric:2,alpha:3" would generate an 8-character
       password in which the first three characters are from the "alpha"
@@ -97,7 +95,6 @@
     </adm:syntax>
     <adm:profile name="ldap">
       <ldap:attribute>
-        <ldap:oid>1.3.6.1.4.1.26027.1.1.171</ldap:oid>
         <ldap:name>ds-cfg-password-format</ldap:name>
       </ldap:attribute>
     </adm:profile>

--
Gitblit v1.10.0