Merge branches/temp-admin@3208 onto trunk@3208.

matthew_swift

26.21.2007 5ceb2e9601d2501d021d0c61188ec913076555a0

 opends/src/admin/defn/org/opends/server/admin/std/SimilarityBasedPasswordValidatorConfiguration.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.88</ldap:oid>
      <ldap:name>ds-cfg-similarity-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="minimum-password-difference" mandatory="true">
  <adm:property name="min-password-difference" mandatory="true">
    <adm:synopsis>
      Specifies the minimum difference of new and old password.
    </adm:synopsis>
@@ -68,8 +67,7 @@
    </adm:syntax>
    <adm:profile name="ldap">
      <ldap:attribute>
        <ldap:oid>1.3.6.1.4.1.26027.1.1.321</ldap:oid>
        <ldap:name>ds-cfg-minimum-password-difference</ldap:name>
        <ldap:name>ds-cfg-min-password-difference</ldap:name>
      </ldap:attribute>
    </adm:profile>
  </adm:property>