Rev 11210: Merge upstream. in file:///home/jelmer/bzr.samba/SAMBA_4_0/

[Jelmer Vernooij]

------------------------------------------------------------
revno: 11210
revision-id: jelmer at samba.org-20070116112841-55jk0tfh9ua8cvt0
parent: jelmer at samba.org-20070116112002-q370cwwegurc2sle
parent: svn-v2:20826 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: SAMBA_4_0
timestamp: Tue 2007-01-16 12:28:41 +0100
message:
  Merge upstream.
modified:
  .bzrignore                     svn-v2:17811 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-.bzrignore
  source/dsdb/samdb/ldb_modules/partition.c svn-v2:16264 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fdsdb%2fsamdb%2fldb_modules%2fpartition.c
  source/dsdb/samdb/samdb.h      svn-v2:14380 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fdsdb%2fsamdb%2fsamdb.h
  source/setup/schema_samba4.ldif svn-v2:17499 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fsetup%2fschema_samba4.ldif
    ------------------------------------------------------------
    revno: 11208.1.1
    merged: svn-v2:20826 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
    parent: svn-v2:20825 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
    committer: metze
    timestamp: Tue 2007-01-16 10:57:55 +0000
    message:
      make the dsdb_control_current_partition struct public and allocate an oid for the
      control
      
      metze
=== modified file '.bzrignore'
--- a/.bzrignore	2007-01-16 11:20:02 +0000
+++ b/.bzrignore	2007-01-16 11:28:41 +0000
@@ -149,3 +149,4 @@
 *_err.h
 source/heimdal/lib/roken/err.h
 source/scripting/ejs/ejsnet/proto.h
+source/heimdal/lib/hx509/asn1_*.c

=== modified file 'source/dsdb/samdb/ldb_modules/partition.c'
--- a/source/dsdb/samdb/ldb_modules/partition.c	2007-01-15 17:53:53 +0000
+++ b/source/dsdb/samdb/ldb_modules/partition.c	2007-01-16 10:57:55 +0000
@@ -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 file 'source/dsdb/samdb/samdb.h'
--- a/source/dsdb/samdb/samdb.h	2007-01-13 11:37:13 +0000
+++ b/source/dsdb/samdb/samdb.h	2007-01-16 10:57:55 +0000
@@ -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 file 'source/setup/schema_samba4.ldif'
--- a/source/setup/schema_samba4.ldif	2007-01-13 11:24:39 +0000
+++ b/source/setup/schema_samba4.ldif	2007-01-16 10:57:55 +0000
@@ -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