svn commit: samba r25753 - in branches/SAMBA_4_0: source/dsdb/samdb/ldb_modules source/setup source/torture/libnet testprogs/ejs

abartlet at samba.org abartlet at samba.org
Tue Oct 30 21:01:08 GMT 2007


Author: abartlet
Date: 2007-10-30 21:01:07 +0000 (Tue, 30 Oct 2007)
New Revision: 25753

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25753

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

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/rootdse.c
   branches/SAMBA_4_0/source/setup/provision_rootdse_add.ldif
   branches/SAMBA_4_0/source/setup/provision_rootdse_modify.ldif
   branches/SAMBA_4_0/source/torture/libnet/libnet_BecomeDC.c
   branches/SAMBA_4_0/testprogs/ejs/ldb.js


Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/rootdse.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/rootdse.c	2007-10-30 08:00:19 UTC (rev 25752)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/rootdse.c	2007-10-30 21:01:07 UTC (rev 25753)
@@ -280,8 +280,8 @@
 	}
 
 	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) {

Modified: branches/SAMBA_4_0/source/setup/provision_rootdse_add.ldif
===================================================================
--- branches/SAMBA_4_0/source/setup/provision_rootdse_add.ldif	2007-10-30 08:00:19 UTC (rev 25752)
+++ branches/SAMBA_4_0/source/setup/provision_rootdse_add.ldif	2007-10-30 21:01:07 UTC (rev 25753)
@@ -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}

Modified: branches/SAMBA_4_0/source/setup/provision_rootdse_modify.ldif
===================================================================
--- branches/SAMBA_4_0/source/setup/provision_rootdse_modify.ldif	2007-10-30 08:00:19 UTC (rev 25752)
+++ branches/SAMBA_4_0/source/setup/provision_rootdse_modify.ldif	2007-10-30 21:01:07 UTC (rev 25753)
@@ -1,5 +1,5 @@
 # mark the database as syncronized
-dn: cn=ROOTDSE
+dn: @ROOTDSE
 changetype: modify
 replace: isSynchronized
 isSynchronized: TRUE

Modified: branches/SAMBA_4_0/source/torture/libnet/libnet_BecomeDC.c
===================================================================
--- branches/SAMBA_4_0/source/torture/libnet/libnet_BecomeDC.c	2007-10-30 08:00:19 UTC (rev 25752)
+++ branches/SAMBA_4_0/source/torture/libnet/libnet_BecomeDC.c	2007-10-30 21:01:07 UTC (rev 25753)
@@ -786,9 +786,9 @@
 		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;
 	}

Modified: branches/SAMBA_4_0/testprogs/ejs/ldb.js
===================================================================
--- branches/SAMBA_4_0/testprogs/ejs/ldb.js	2007-10-30 08:00:19 UTC (rev 25752)
+++ branches/SAMBA_4_0/testprogs/ejs/ldb.js	2007-10-30 21:01:07 UTC (rev 25753)
@@ -89,7 +89,7 @@
 dn: @MODULES
 @LIST: rootdse,operational,rdn_name,partition
 
-dn: cn=ROOTDSE
+dn: @ROOTDSE
 defaultNamingContext: cn=Test
 
 dn: @PARTITION



More information about the samba-cvs mailing list