summaryrefslogtreecommitdiff
path: root/source4/dsdb/samdb/ldb_modules
diff options
context:
space:
mode:
Diffstat (limited to 'source4/dsdb/samdb/ldb_modules')
-rw-r--r--source4/dsdb/samdb/ldb_modules/samba_dsdb.c1
-rw-r--r--source4/dsdb/samdb/ldb_modules/tombstone_reanimate.c8
2 files changed, 8 insertions, 1 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/samba_dsdb.c b/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
index 75553ad42e0..26c583ef58a 100644
--- a/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
+++ b/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
@@ -273,7 +273,6 @@ static int samba_dsdb_init(struct ldb_module *module)
NULL };
/* extended_dn_in or extended_dn_in_openldap goes here */
static const char *modules_list1a[] = {"objectclass",
- "tombstone_reanimate",
"descriptor",
"acl",
"aclread",
diff --git a/source4/dsdb/samdb/ldb_modules/tombstone_reanimate.c b/source4/dsdb/samdb/ldb_modules/tombstone_reanimate.c
index add6c572ec8..0c6c500c7e9 100644
--- a/source4/dsdb/samdb/ldb_modules/tombstone_reanimate.c
+++ b/source4/dsdb/samdb/ldb_modules/tombstone_reanimate.c
@@ -426,5 +426,13 @@ static const struct ldb_module_ops ldb_reanimate_module_ops = {
int ldb_tombstone_reanimate_module_init(const char *version)
{
LDB_MODULE_CHECK_VERSION(version);
+ /*
+ * Skip module registration for now.
+ * In order to enable the module again, it should be
+ * included in samba_dsdb.c between "objectclass" and
+ * "descriptor" modules.
return ldb_register_module(&ldb_reanimate_module_ops);
+ */
+ DEBUG(5,("Module 'tombstone_reanimate' is disabled. Skip registration."));
+ return LDB_SUCCESS;
}