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

matthew_swift

26.21.2007 5ceb2e9601d2501d021d0c61188ec913076555a0

 opends/src/admin/defn/org/opends/server/admin/std/PasswordPolicyImportPluginConfiguration.xml

@@ -42,13 +42,12 @@

  <adm:profile name="ldap">
    <ldap:object-class>
      <ldap:oid>1.3.6.1.4.1.26027.1.2.115</ldap:oid>
      <ldap:name>ds-cfg-password-policy-import-plugin</ldap:name>
      <ldap:superior>ds-cfg-plugin</ldap:superior>
    </ldap:object-class>
  </adm:profile>

  <adm:property-override name="plugin-class">
  <adm:property-override name="java-class">
    <adm:default-behavior>
      <adm:defined>
        <adm:value>
@@ -66,14 +65,14 @@
    </adm:default-behavior>
  </adm:property-override>

  <adm:property name="default-user-password-storage-scheme-dn" mandatory="false"
  <adm:property name="default-user-password-storage-scheme" mandatory="false"
       multi-valued="true">
    <adm:synopsis>
      Specifies the DNs of the configuration entries for the password storage
      schemes that will be used for encoding passwords contained in attributes
      with the user password syntax for entries that do not include the
      ds-pwp-password-policy-dn attribute to specify which password policy
      should be used to govern them.
      Specifies the names of the password storage schemes that will be
      used for encoding passwords contained in attributes with the user
      password syntax for entries that do not include the
      ds-pwp-password-policy-dn attribute to specify which password
      policy should be used to govern them.
    </adm:synopsis>
    <adm:default-behavior>
      <adm:alias>
@@ -86,26 +85,26 @@
      </adm:alias>
    </adm:default-behavior>
    <adm:syntax>
      <adm:dn>
        <adm:base>cn=password storage schemes,cn=config</adm:base>
      </adm:dn>
      <adm:aggregation relation-name="password-storage-scheme" 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.429</ldap:oid>
        <ldap:name>ds-cfg-default-user-password-storage-scheme</ldap:name>
      </ldap:attribute>
    </adm:profile>
  </adm:property>

  <adm:property name="default-auth-password-storage-scheme-dn" mandatory="false"
  <adm:property name="default-auth-password-storage-scheme" mandatory="false"
  multi-valued="true">
    <adm:synopsis>
      Specifies the DNs of the configuration entries for the password storage
      schemes that will be used for encoding passwords contained in attributes
      with the auth password syntax for entries that do not include the
      ds-pwp-password-policy-dn attribute to specify which password policy
      should be used to govern them.
      Specifies the names of password storage schemes that will be used
      for encoding passwords contained in attributes with the auth
      password syntax for entries that do not include the
      ds-pwp-password-policy-dn attribute to specify which password
      policy should be used to govern them.
    </adm:synopsis>
    <adm:default-behavior>
      <adm:alias>
@@ -118,14 +117,14 @@
      </adm:alias>
    </adm:default-behavior>
    <adm:syntax>
      <adm:dn>
        <adm:base>cn=password storage schemes,cn=config</adm:base>
      </adm:dn>
      <adm:aggregation relation-name="password-storage-scheme" 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.430</ldap:oid>
        <ldap:name>ds-cfg-default-auth-password-storage-scheme-dn</ldap:name>
        <ldap:name>ds-cfg-default-auth-password-storage-scheme</ldap:name>
      </ldap:attribute>
    </adm:profile>
  </adm:property>