From 47f6988c6d51d245ecacf2ab5c638382a7fdaeb5 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 30 Oct 2007 21:01:07 +0100
Subject: r25753: Move cn=rootdse to @ROOTDSE to avoid being caught up in
 schema restrictions.

Andrew Bartlett
(This used to be commit f3390c9054244c0e4381007b36bbac9a17800570)
---
 source4/dsdb/samdb/ldb_modules/rootdse.c    | 4 ++--
 source4/setup/provision_rootdse_add.ldif    | 2 +-
 source4/setup/provision_rootdse_modify.ldif | 2 +-
 source4/torture/libnet/libnet_BecomeDC.c    | 4 ++--
 testprogs/ejs/ldb.js                        | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/source4/dsdb/samdb/ldb_modules/rootdse.c b/source4/dsdb/samdb/ldb_modules/rootdse.c
index a808d674e2..02f43d7076 100644
--- 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 63abf64e89..9f19796ec6 100644
--- 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 5ccda79b7a..1f950171a2 100644
--- 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 edcf92b8ec..65d4deaaa4 100644
--- 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 36b175f2c1..8c71994805 100755
--- 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
-- 
cgit