summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2010-06-14 15:30:36 +1000
committerAndrew Bartlett <abartlet@samba.org>2010-06-16 09:57:51 +1000
commitecfce7365c8d3fffc5b8eeda13b18e2605ff7b02 (patch)
treef730f9ad7380ac25759ce706d537ff88b1c9e0c0
parent81f70834caa4d77f0799506bd9c17d05d631ebd4 (diff)
downloadsamba-ecfce7365c8d3fffc5b8eeda13b18e2605ff7b02.tar.gz
samba-ecfce7365c8d3fffc5b8eeda13b18e2605ff7b02.tar.bz2
samba-ecfce7365c8d3fffc5b8eeda13b18e2605ff7b02.zip
s4:dsdb Add control for signaling between repl_meta_data and linked_attributes
This control will allow the linked_attributes module to know if repl_meta_data has already handled the creation of forward and back links. Andrew Bartlett
-rw-r--r--source4/dsdb/common/util.h1
-rw-r--r--source4/dsdb/samdb/samdb.h5
-rw-r--r--source4/setup/schema_samba4.ldif1
3 files changed, 7 insertions, 0 deletions
diff --git a/source4/dsdb/common/util.h b/source4/dsdb/common/util.h
index 53ffdc4d31..0b6ef3d0a1 100644
--- a/source4/dsdb/common/util.h
+++ b/source4/dsdb/common/util.h
@@ -31,4 +31,5 @@
#define DSDB_MODIFY_RELAX 0x0020
#define DSDB_MODIFY_PERMISSIVE 0x0040
#define DSDB_FLAG_AS_SYSTEM 0x0080
+
#define DSDB_SEARCH_ONE_ONLY 0x0020 /* give an error unless 1 record */
diff --git a/source4/dsdb/samdb/samdb.h b/source4/dsdb/samdb/samdb.h
index ee42269000..88c61132ee 100644
--- a/source4/dsdb/samdb/samdb.h
+++ b/source4/dsdb/samdb/samdb.h
@@ -82,6 +82,11 @@ struct dsdb_control_password_change_status {
#define DSDB_CONTROL_PASSWORD_CHANGE_OLD_PW_CHECKED_OID "1.3.6.1.4.1.7165.4.3.10"
+/**
+ DSDB_CONTROL_APPLY_LINKS is internal to Samba4 - a token passed between repl_meta_data and linked_attributes modules
+*/
+#define DSDB_CONTROL_APPLY_LINKS "1.3.6.1.4.1.7165.4.3.11"
+
#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;
diff --git a/source4/setup/schema_samba4.ldif b/source4/setup/schema_samba4.ldif
index 2e61911b62..112fd22555 100644
--- a/source4/setup/schema_samba4.ldif
+++ b/source4/setup/schema_samba4.ldif
@@ -183,6 +183,7 @@
#Allocated: DSDB_CONTROL_PASSWORD_CHANGE_STATUS_OID 1.3.6.1.4.1.7165.4.3.8
#Allocated: DSDB_CONTROL_PASSWORD_HASH_VALUES_OID 1.3.6.1.4.1.7165.4.3.9
#Allocated: DSDB_CONTROL_PASSWORD_CHANGE_OLD_PW_CHECKED_OID 1.3.6.1.4.1.7165.4.3.10
+#Allocated: DSDB_CONTROL_APPLY_LINKS 1.3.6.1.4.1.7165.4.3.11
# Extended 1.3.6.1.4.1.7165.4.4.x
#Allocated: DSDB_EXTENDED_REPLICATED_OBJECTS_OID 1.3.6.1.4.1.7165.4.4.1