Revert "dsdb: Disable tombstone_reanimation module until we isolate what causes flaky...

This reverts commit 252b62c54ed5a4aabbdccf315f1a0ae3d958d11c.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/source4/dsdb/samdb/ldb_modules/samba_dsdb.c b/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
index 3f8cc51924238f0dbe034b444b1fa24c26b92201..21168a9d714022ae26889f1a213e1d533d122f6f 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
+++ b/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
@@ -275,6 +275,7 @@ 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 5a630917ed468676218900702fd0109b387b6d8e..64e05195798f11b79a03579e473276a44a001438 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/tombstone_reanimate.c
+++ b/source4/dsdb/samdb/ldb_modules/tombstone_reanimate.c
@@ -421,13 +421,5 @@ 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;
 }

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index de7ef2321606b1ffec0ec534a7339f03a1e64fd2..1b1394017a7f7da1a3fb2bf13a21bb4e53197837 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -600,6 +600,11 @@ for env in ["ad_dc_ntvfs"]:
     # environments, please only add new ones if there's really a
     # difference we need to test
     plantestsuite_loadlist("samba4.ldap.password_lockout.python(%s)" % env, env, [python, os.path.join(samba4srcdir, "dsdb/tests/python/password_lockout.py"), "$SERVER", '-U"$USERNAME%$PASSWORD"', "-W$DOMAIN", "--realm=$REALM", '$LOADLIST', '$LISTOPT'])
+    planoldpythontestsuite(env, "tombstone_reanimation",
+                           name="samba4.tombstone_reanimation.python",
+                           environ={'TEST_SERVER': '$SERVER', 'TEST_USERNAME': '$USERNAME', 'TEST_PASSWORD': '$PASSWORD'},
+                           extra_path=[os.path.join(samba4srcdir, 'dsdb/tests/python')]
+                           )
 
 planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.upgradeprovisionneeddc")
 planpythontestsuite("ad_dc:local", "samba.tests.posixacl")