summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-09-23 17:27:40 +1000
committerAndrew Tridgell <tridge@samba.org>2011-10-04 15:08:55 +1100
commitd3fa49663f37de4c2c35f43a9cf6844a60531db0 (patch)
tree722c91d1adabc0e03113c1c05da9412cf5baa822
parent0d2d6c94d2da09b01d91c31cbf099248fac90802 (diff)
downloadsamba-d3fa49663f37de4c2c35f43a9cf6844a60531db0.tar.gz
samba-d3fa49663f37de4c2c35f43a9cf6844a60531db0.tar.bz2
samba-d3fa49663f37de4c2c35f43a9cf6844a60531db0.zip
s4-dsdb: added DSDB_REPL_FLAG* to replication
this allows the replication server to control replication via a set of flags. Initial flags will allow control for partial replications and full_sync support
-rw-r--r--source4/dsdb/samdb/samdb.h17
1 files changed, 15 insertions, 2 deletions
diff --git a/source4/dsdb/samdb/samdb.h b/source4/dsdb/samdb/samdb.h
index f60f34b2ae..12c0034f2f 100644
--- a/source4/dsdb/samdb/samdb.h
+++ b/source4/dsdb/samdb/samdb.h
@@ -53,8 +53,18 @@ struct dsdb_control_current_partition {
struct ldb_dn *dn;
};
+
+/*
+ flags in dsdb_repl_flags to control replication logic
+ */
+#define DSDB_REPL_FLAG_PRIORITISE_INCOMING 1
+#define DSDB_REPL_FLAG_PARTIAL_REPLICA 2
+
+
#define DSDB_CONTROL_REPLICATED_UPDATE_OID "1.3.6.1.4.1.7165.4.3.3"
-/* DSDB_CONTROL_REPLICATED_UPDATE_OID has NULL data */
+struct dsdb_control_replicated_update {
+ uint32_t dsdb_repl_flags;
+};
#define DSDB_CONTROL_DN_STORAGE_FORMAT_OID "1.3.6.1.4.1.7165.4.3.4"
/* DSDB_CONTROL_DN_STORAGE_FORMAT_OID has NULL data and behaves very
@@ -119,9 +129,12 @@ struct dsdb_extended_replicated_objects {
* this is the version of the dsdb_extended_replicated_objects
* version 0: initial implementation
*/
-#define DSDB_EXTENDED_REPLICATED_OBJECTS_VERSION 1
+#define DSDB_EXTENDED_REPLICATED_OBJECTS_VERSION 2
uint32_t version;
+ /* DSDB_REPL_FLAG_* flags */
+ uint32_t dsdb_repl_flags;
+
struct ldb_dn *partition_dn;
const struct repsFromTo1 *source_dsa;