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>

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;