From a052caad0008ede711b0c43d9955eccc3bb858ba 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.

---
 opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/RootDSEBackendConfiguration.xml |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/RootDSEBackendConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/RootDSEBackendConfiguration.xml
index 4d15cd0..c1393e0 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/RootDSEBackendConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/RootDSEBackendConfiguration.xml
@@ -42,8 +42,7 @@
   <adm:tag name="database"/>
   <adm:profile name="ldap">
     <ldap:object-class>
-      <ldap:oid>1.3.6.1.4.1.26027.1.2.42</ldap:oid>
-      <ldap:name>ds-cfg-root-dse</ldap:name>
+      <ldap:name>ds-cfg-root-dse-backend</ldap:name>
       <ldap:superior>top</ldap:superior>
     </ldap:object-class>
   </adm:profile>
@@ -64,7 +63,6 @@
     </adm:syntax>
     <adm:profile name="ldap">
       <ldap:attribute>
-        <ldap:oid>1.3.6.1.4.1.26027.1.1.122</ldap:oid>
         <ldap:name>ds-cfg-subordinate-base-dn</ldap:name>
       </ldap:attribute>
     </adm:profile>
@@ -82,7 +80,6 @@
     </adm:syntax>
     <adm:profile name="ldap">
       <ldap:attribute>
-        <ldap:oid>1.3.6.1.4.1.26027.1.1.141</ldap:oid>
         <ldap:name>ds-cfg-show-all-attributes</ldap:name>
       </ldap:attribute>
     </adm:profile>

--
Gitblit v1.10.0