------------------------------------------------------------
revno: 11210
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 4.0-fixref
timestamp: Tue 2007-01-16 12:57:12 +0100
message:
Merge bzrignore fixes and upstream changes.
modified:
.bzrignore svn-v2:[EMAIL PROTECTED]
source/dsdb/samdb/ldb_modules/partition.c svn-v2:[EMAIL PROTECTED]
source/dsdb/samdb/samdb.h svn-v2:[EMAIL PROTECTED]
source/setup/schema_samba4.ldif svn-v2:[EMAIL PROTECTED]
------------------------------------------------------------
revno: 11208.1.2
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: SAMBA_4_0
timestamp: Tue 2007-01-16 12:28:41 +0100
message:
Merge upstream.
------------------------------------------------------------
revno: 11208.2.1
merged: svn-v2:[EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
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
------------------------------------------------------------
revno: 11208.1.1
merged: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: SAMBA_4_0
timestamp: Tue 2007-01-16 12:20:02 +0100
message:
Ignore some more files.
=== modified file '.bzrignore'
--- a/.bzrignore 2006-10-29 17:40:19 +0000
+++ b/.bzrignore 2007-01-16 11:28:41 +0000
@@ -132,3 +132,21 @@
source/winbind/wb_proto.h
source/wrepl_server/wrepl_server_proto.h
tags
+webapps/swat/build
+webapps/qooxdoo-0.6.3-sdk/frontend/framework/.cache
+source/auth/credentials/credentials_krb5_proto.h
+source/kdc/pac_glue.h
+source/lib/cmdline/popt_credentials.h
+source/lib/samba3/samba3_smbpasswd_proto.h
+source/lib/util/util_tdb.h
+source/ntvfs/cifs_posix_cli/proto.h
+source/param/secrets_proto.h
+source/smbd/pidfile.h
+source/torture/rap/proto.h
+*_asn1.h
+*_asn1_files
+*_err.c
+*_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
