summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2009-12-16 17:14:26 +1100
committerAndrew Tridgell <tridge@samba.org>2010-01-02 08:16:49 +1100
commitbd5678f4bebad82f1b949931049bbd8496616777 (patch)
treecb7f47ac37765b179e453577649ecf85fb137deb
parent3199e02884af3b14348a88e8d8d7bc852212536f (diff)
downloadsamba-bd5678f4bebad82f1b949931049bbd8496616777.tar.gz
samba-bd5678f4bebad82f1b949931049bbd8496616777.tar.bz2
samba-bd5678f4bebad82f1b949931049bbd8496616777.zip
s4-dsdb: repl_meta_data now replaces objectguid in all cases
We don't want to be debugging two different code paths through the ldb module stack, so better to always do the work of repl_meta_data, even for a standalone server Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--source4/dsdb/samdb/ldb_modules/samba_dsdb.c18
1 files changed, 2 insertions, 16 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/samba_dsdb.c b/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
index bfa2599afe..a461a94806 100644
--- a/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
+++ b/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
@@ -234,16 +234,11 @@ static int samba_dsdb_init(struct ldb_module *module)
"instancetype",
NULL };
- const char *objectguid_module;
- /* if serverrole == "domain controller": */
- const char *repl_meta_data = "repl_meta_data";
- /* else: */
- const char *objectguid = "objectguid";
-
const char **link_modules;
static const char *tdb_modules_list[] = {
- "subtree_rename",
"subtree_delete",
+ "repl_meta_data",
+ "subtree_rename",
"linked_attributes",
NULL};
@@ -328,15 +323,9 @@ static int samba_dsdb_init(struct ldb_module *module)
backend_modules = NULL;
if (strcasecmp(backendType, "ldb") == 0) {
- if (strcasecmp(serverRole, "dc") == 0 || strcasecmp(serverRole, "domain controller") == 0) {
- objectguid_module = repl_meta_data;
- } else {
- objectguid_module = objectguid;
- }
extended_dn_module = extended_dn_module_ldb;
link_modules = tdb_modules_list;
} else {
- objectguid_module = NULL;
link_modules = NULL;
if (strcasecmp(backendType, "fedora-ds") == 0) {
backend_modules = fedora_ds_backend_modules;
@@ -359,9 +348,6 @@ static int samba_dsdb_init(struct ldb_module *module)
final_module_list = str_list_copy_const(tmp_ctx, modules_list);
CHECK_MODULE_LIST;
- final_module_list = str_list_add_const(final_module_list, objectguid_module);
- CHECK_MODULE_LIST;
-
final_module_list = str_list_append_const(final_module_list, link_modules);
CHECK_MODULE_LIST;