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

matthew_swift

26.21.2007 5ceb2e9601d2501d021d0c61188ec913076555a0

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

@@ -41,8 +41,7 @@

  <adm:profile name="ldap">
    <ldap:object-class>
      <ldap:oid>1.3.6.1.4.1.26027.1.2.41</ldap:oid>
      <ldap:name>ds-cfg-root-dn</ldap:name>
      <ldap:name>ds-cfg-root-dn-user</ldap:name>
      <ldap:superior>top</ldap:superior>
    </ldap:object-class>
  </adm:profile>
@@ -65,7 +64,6 @@
    </adm:syntax>
    <adm:profile name="ldap">
      <ldap:attribute>
        <ldap:oid>1.3.6.1.4.1.26027.1.1.17</ldap:oid>
        <ldap:name>ds-cfg-alternate-bind-dn</ldap:name>
      </ldap:attribute>
    </adm:profile>