svn commit: samba r20826 - in branches/SAMBA_4_0/source: dsdb/samdb dsdb/samdb/ldb_modules setup

[metze at samba.org]

Author: metze
Date: 2007-01-16 10:57:55 +0000 (Tue, 16 Jan 2007)
New Revision: 20826

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

Log:
make the dsdb_control_current_partition struct public and allocate an oid for the
control

metze
Modified:
   branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/partition.c
   branches/SAMBA_4_0/source/dsdb/samdb/samdb.h
   branches/SAMBA_4_0/source/setup/schema_samba4.ldif


Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/partition.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/partition.c	2007-01-16 09:48:39 UTC (rev 20825)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/partition.c	2007-01-16 10:57:55 UTC (rev 20826)
@@ -38,11 +38,6 @@
 #include "ldb/include/includes.h"
 #include "dsdb/samdb/samdb.h"
 
-struct dsdb_control_current_partition {
-	struct ldb_module *module;
-	const char *backend;
-	struct ldb_dn *dn;
-};
 struct partition_private_data {
 	struct dsdb_control_current_partition **partitions;
 	struct ldb_dn **replicate;
@@ -697,6 +692,7 @@
 			talloc_free(mem_ctx);
 			return LDB_ERR_OPERATIONS_ERROR;
 		}
+		data->partitions[i]->version = DSDB_CONTROL_CURRENT_PARTITION_VERSION;
 
 		data->partitions[i]->dn = ldb_dn_new(data->partitions[i], module->ldb, base);
 		if (!data->partitions[i]->dn) {

Modified: branches/SAMBA_4_0/source/dsdb/samdb/samdb.h
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/samdb.h	2007-01-16 09:48:39 UTC (rev 20825)
+++ branches/SAMBA_4_0/source/dsdb/samdb/samdb.h	2007-01-16 10:57:55 UTC (rev 20826)
@@ -24,6 +24,7 @@
 #define __SAMDB_H__
 
 struct auth_session_info;
+struct dsdb_control_current_partition;
 struct dsdb_extended_replicated_object;
 struct dsdb_extended_replicated_objects;
 
@@ -35,6 +36,22 @@
 #include "dsdb/schema/schema.h"
 #include "dsdb/samdb/samdb_proto.h"
 
+#define DSDB_CONTROL_CURRENT_PARTITION_OID "1.3.6.1.4.1.7165.4.3.2"
+struct dsdb_control_current_partition {
+	/* 
+	 * this is the version of the dsdb_control_current_partition
+	 * version 0: initial implementation
+	 */
+#define DSDB_CONTROL_CURRENT_PARTITION_VERSION 0
+	uint32_t version;
+
+	struct ldb_dn *dn;
+
+	const char *backend;
+
+	struct ldb_module *module;
+};
+
 #define DSDB_EXTENDED_REPLICATED_OBJECTS_OID "1.3.6.1.4.1.7165.4.4.1"
 struct dsdb_extended_replicated_object {
 	struct ldb_message *msg;

Modified: branches/SAMBA_4_0/source/setup/schema_samba4.ldif
===================================================================
--- branches/SAMBA_4_0/source/setup/schema_samba4.ldif	2007-01-16 09:48:39 UTC (rev 20825)
+++ branches/SAMBA_4_0/source/setup/schema_samba4.ldif	2007-01-16 10:57:55 UTC (rev 20826)
@@ -149,6 +149,8 @@
 
 #Allocated: (not used anymore) DSDB_CONTROL_REPLICATED_OBJECT_OID 1.3.6.1.4.1.7165.4.3.1
 
+#Allocated: DSDB_CONTROL_CURRENT_PARTITION_OID 1.3.6.1.4.1.7165.4.3.2
+
 #Allocated: DSDB_EXTENDED_REPLICATED_OBJECTS_OID 1.3.6.1.4.1.7165.4.4.1
 
 #Allocated: (middleName) attributeID: 1.3.6.1.4.1.7165.4.255.1