svn commit: samba r20321 - in branches/SAMBA_4_0/source/dsdb/samdb: .

[metze at samba.org]

Author: metze
Date: 2006-12-22 17:39:01 +0000 (Fri, 22 Dec 2006)
New Revision: 20321

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

Log:
fix the samdb_partitions_dn() and samdb_sites_dn() calls,
to use the new samdb_config_dn() call.

also add samdb_ wrappers for samdb_schema_dn() and samdb_config_dn()

metze
Modified:
   branches/SAMBA_4_0/source/dsdb/samdb/samdb.c


Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/samdb.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/samdb.c	2006-12-22 17:27:07 UTC (rev 20320)
+++ branches/SAMBA_4_0/source/dsdb/samdb/samdb.c	2006-12-22 17:39:01 UTC (rev 20321)
@@ -1030,13 +1030,27 @@
 	return ldb_get_default_basedn(sam_ctx);
 }
 
+struct ldb_dn *samdb_config_dn(struct ldb_context *sam_ctx) 
+{
+	return ldb_get_config_basedn(sam_ctx);
+}
 
+struct ldb_dn *samdb_schema_dn(struct ldb_context *sam_ctx) 
+{
+	return ldb_get_schema_basedn(sam_ctx);
+}
+
+struct ldb_dn *samdb_root_dn(struct ldb_context *sam_ctx) 
+{
+	return ldb_get_root_basedn(sam_ctx);
+}
+
 struct ldb_dn *samdb_partitions_dn(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx)
 {
 	struct ldb_dn *new_dn;
 
-	new_dn = ldb_dn_copy(mem_ctx, samdb_base_dn(sam_ctx));
-	if ( ! ldb_dn_add_child_fmt(new_dn, "CN=Partitions,CN=Configuration")) {
+	new_dn = ldb_dn_copy(mem_ctx, samdb_config_dn(sam_ctx));
+	if ( ! ldb_dn_add_child_fmt(new_dn, "CN=Partitions")) {
 		talloc_free(new_dn);
 		return NULL;
 	}
@@ -1047,8 +1061,8 @@
 {
 	struct ldb_dn *new_dn;
 
-	new_dn = ldb_dn_copy(mem_ctx, samdb_base_dn(sam_ctx));
-	if ( ! ldb_dn_add_child_fmt(new_dn, "CN=Sites,CN=Configuration")) {
+	new_dn = ldb_dn_copy(mem_ctx, samdb_config_dn(sam_ctx));
+	if ( ! ldb_dn_add_child_fmt(new_dn, "CN=Sites")) {
 		talloc_free(new_dn);
 		return NULL;
 	}