aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2009-09-24 07:19:01 -0700
committerAndrew Tridgell <tridge@samba.org>2009-09-24 10:37:24 -0700
commit547a6da58e4de2e87ac55c62001cfee8e806b323 (patch)
treeddcd57f15741465f0939daf9b7e566a63dc940f0
parent3b7c668606c63d85eeb7f61920e8f40074d7829f (diff)
downloadsamba-547a6da58e4de2e87ac55c62001cfee8e806b323.tar.gz
samba-547a6da58e4de2e87ac55c62001cfee8e806b323.tar.xz
samba-547a6da58e4de2e87ac55c62001cfee8e806b323.zip
s4-drs: add defines for replication flags on attributes
-rw-r--r--libds/common/flags.h3
-rw-r--r--source4/dsdb/samdb/ldb_modules/repl_meta_data.c7
2 files changed, 5 insertions, 5 deletions
diff --git a/libds/common/flags.h b/libds/common/flags.h
index dfdd603a154..fb90e6614ee 100644
--- a/libds/common/flags.h
+++ b/libds/common/flags.h
@@ -180,3 +180,6 @@
#define DS_DC_FUNCTION_2008 3
#define DS_DC_FUNCTION_2008_R2 4
+/* sa->systemFlags on attributes */
+#define DS_FLAG_ATTR_NOT_REPLICATED 0x00000001
+#define DS_FLAG_ATTR_IS_CONSTRUCTED 0x00000004
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index df399e24f09..f07dc1411b2 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -567,7 +567,7 @@ static int replmd_add(struct ldb_module *module, struct ldb_request *req)
return LDB_ERR_NO_SUCH_ATTRIBUTE;
}
- if ((sa->systemFlags & 0x00000001) || (sa->systemFlags & 0x00000004)) {
+ if ((sa->systemFlags & DS_FLAG_ATTR_NOT_REPLICATED) || (sa->systemFlags & DS_FLAG_ATTR_IS_CONSTRUCTED)) {
/* if the attribute is not replicated (0x00000001)
* or constructed (0x00000004) it has no metadata
*/
@@ -689,10 +689,7 @@ static int replmd_update_rpmd_element(struct ldb_context *ldb,
return LDB_ERR_OPERATIONS_ERROR;
}
- if ((a->systemFlags & 0x00000001) || (a->systemFlags & 0x00000004)) {
- /* if the attribute is not replicated (0x00000001)
- * or constructed (0x00000004) it has no metadata
- */
+ if ((a->systemFlags & DS_FLAG_ATTR_NOT_REPLICATED) || (a->systemFlags & DS_FLAG_ATTR_IS_CONSTRUCTED)) {
return LDB_SUCCESS;
}