r25753: Move cn=rootdse to @ROOTDSE to avoid being caught up in schema restrictions.

Andrew Bartlett
(This used to be commit f3390c9054244c0e4381007b36bbac9a17800570)

diff --git a/source4/dsdb/samdb/ldb_modules/rootdse.c b/source4/dsdb/samdb/ldb_modules/rootdse.c
index a808d674e2925f21faaca6d12e7e2c1db5f7ccf6..02f43d7076ac15e7c3806583d2d31dfd73a4f71c 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/rootdse.c
+++ b/source4/dsdb/samdb/ldb_modules/rootdse.c
@@ -280,8 +280,8 @@ static int rootdse_search(struct ldb_module *module, struct ldb_request *req)
        }
 
        down_req->operation = req->operation;
-       /* in our db we store the rootDSE with a DN of cn=rootDSE */
-       down_req->op.search.base = ldb_dn_new(down_req, module->ldb, "cn=rootDSE");
+       /* in our db we store the rootDSE with a DN of @ROOTDSE */
+       down_req->op.search.base = ldb_dn_new(down_req, module->ldb, "@ROOTDSE");
        down_req->op.search.scope = LDB_SCOPE_BASE;
        down_req->op.search.tree = ldb_parse_tree(down_req, NULL);
        if (down_req->op.search.base == NULL || down_req->op.search.tree == NULL) {

diff --git a/source4/setup/provision_rootdse_add.ldif b/source4/setup/provision_rootdse_add.ldif
index 63abf64e8936940b5f447380835982b816ca1cfc..9f19796ec6c6049caf7ba0601a17a77721010812 100644 (file)
--- a/source4/setup/provision_rootdse_add.ldif
+++ b/source4/setup/provision_rootdse_add.ldif
@@ -1,5 +1,5 @@
 # the rootDSE module looks in this record for its base data
-dn: cn=ROOTDSE
+dn: @ROOTDSE
 subschemaSubentry: CN=Aggregate,${SCHEMADN}
 dsServiceName: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,${CONFIGDN}
 defaultNamingContext: ${DOMAINDN}

diff --git a/source4/setup/provision_rootdse_modify.ldif b/source4/setup/provision_rootdse_modify.ldif
index 5ccda79b7a2724b487993f60ecf75d9bf2189b71..1f950171a26cf85c0a38b66b8ac5d8c27724dfa0 100644 (file)
--- a/source4/setup/provision_rootdse_modify.ldif
+++ b/source4/setup/provision_rootdse_modify.ldif
@@ -1,5 +1,5 @@
 # mark the database as syncronized
-dn: cn=ROOTDSE
+dn: @ROOTDSE
 changetype: modify
 replace: isSynchronized
 isSynchronized: TRUE

diff --git a/source4/torture/libnet/libnet_BecomeDC.c b/source4/torture/libnet/libnet_BecomeDC.c
index edcf92b8ec53c86ef71b80778ca306b233b24eac..65d4deaaa4a5f095d34335b178c7573fdf1c79ed 100644 (file)
--- a/source4/torture/libnet/libnet_BecomeDC.c
+++ b/source4/torture/libnet/libnet_BecomeDC.c
@@ -786,9 +786,9 @@ bool torture_net_become_dc(struct torture_context *torture)
                ret = false;
                goto cleanup;
        }
-       msg->dn = ldb_dn_new(msg, s->ldb, "cn=ROOTDSE");
+       msg->dn = ldb_dn_new(msg, s->ldb, "@ROOTDSE");
        if (!msg->dn) {
-               printf("ldb_msg_new(cn=ROOTDSE) failed\n");
+               printf("ldb_msg_new(@ROOTDSE) failed\n");
                ret = false;
                goto cleanup;
        }

diff --git a/testprogs/ejs/ldb.js b/testprogs/ejs/ldb.js
index 36b175f2c12bb516da0f77106a7adc7b17b1e994..8c71994805b14bca6d9a93ba209b1b5c67b8e2ab 100755 (executable)
--- a/testprogs/ejs/ldb.js
+++ b/testprogs/ejs/ldb.js
@@ -89,7 +89,7 @@ function setup_modules(ldb)
 dn: @MODULES
 @LIST: rootdse,operational,rdn_name,partition
 
-dn: cn=ROOTDSE
+dn: @ROOTDSE
 defaultNamingContext: cn=Test
 
 dn: @PARTITION