Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-python
[ira/wip.git] / source / torture / libnet / libnet_BecomeDC.c
index 7605ad5c6ed29f0c4cfca20ee5b3284f0bbcc453..0dd06bda4cb771eb533264ae4ee04df83932fbd1 100644 (file)
@@ -3,11 +3,11 @@
 
    libnet_BecomeDC() tests
 
-   Copyright (C) Stefan (metze) Metzmacher 2006
+   Copyright (C) Stefan Metzmacher <metze@samba.org> 2006
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "system/time.h"
 #include "auth/auth.h"
-#include "lib/db_wrap.h"
+#include "lib/ldb_wrap.h"
+
+struct test_become_dc_state {
+       struct libnet_context *ctx;
+       struct torture_context *tctx;
+       const char *netbios_name;
+       struct test_join *tj;
+       struct cli_credentials *machine_account;
+       struct dsdb_schema *self_made_schema;
+       const struct dsdb_schema *schema;
+
+       struct ldb_context *ldb;
+
+       struct {
+               uint32_t object_count;
+               struct drsuapi_DsReplicaObjectListItemEx *first_object;
+               struct drsuapi_DsReplicaObjectListItemEx *last_object;
+       } schema_part;
+
+       struct {
+               const char *samdb_ldb;
+               const char *domaindn_ldb;
+               const char *configdn_ldb;
+               const char *schemadn_ldb;
+               const char *secrets_ldb;
+               const char *templates_ldb;
+               const char *secrets_keytab;
+               const char *dns_keytab;
+       } path;
+};
+
+static NTSTATUS test_become_dc_check_options(void *private_data,
+                                            const struct libnet_BecomeDC_CheckOptions *o)
+{
+       struct test_become_dc_state *s = talloc_get_type(private_data, struct test_become_dc_state);
+
+       DEBUG(0,("Become DC [%s] of Domain[%s]/[%s]\n",
+               s->netbios_name,
+               o->domain->netbios_name, o->domain->dns_name));
+
+       DEBUG(0,("Promotion Partner is Server[%s] from Site[%s]\n",
+               o->source_dsa->dns_name, o->source_dsa->site_name));
+
+       DEBUG(0,("Options:crossRef behavior_version[%u]\n"
+                      "\tschema object_version[%u]\n"
+                      "\tdomain behavior_version[%u]\n"
+                      "\tdomain w2k3_update_revision[%u]\n", 
+               o->forest->crossref_behavior_version,
+               o->forest->schema_object_version,
+               o->domain->behavior_version,
+               o->domain->w2k3_update_revision));
+
+       return NT_STATUS_OK;
+}
+
 #include "lib/appweb/ejs/ejs.h"
 #include "lib/appweb/ejs/ejsInternal.h"
 #include "scripting/ejs/smbcalls.h"
@@ -94,54 +147,16 @@ failed:
        return ejs_error;
 }
 
-#define TORTURE_NETBIOS_NAME "smbtorturedc"
-#define TORTURE_SAMDB_LDB "test_samdb.ldb"
-
-struct test_become_dc_state {
-       struct libnet_context *ctx;
-       struct test_join *tj;
-       struct cli_credentials *machine_account;
-       struct dsdb_schema *self_made_schema;
-       const struct dsdb_schema *schema;
-
-       struct ldb_context *ldb;
-
-       struct {
-               uint32_t object_count;
-               struct drsuapi_DsReplicaObjectListItemEx *first_object;
-               struct drsuapi_DsReplicaObjectListItemEx *last_object;
-       } schema_part;
-};
-
-static NTSTATUS test_become_dc_check_options(void *private_data,
-                                            const struct libnet_BecomeDC_CheckOptions *o)
-{
-       DEBUG(0,("Become DC of Domain[%s]/[%s]\n",
-               o->domain->netbios_name, o->domain->dns_name));
-
-       DEBUG(0,("Promotion Partner is Server[%s] from Site[%s]\n",
-               o->source_dsa->dns_name, o->source_dsa->site_name));
-
-       DEBUG(0,("Options:crossRef behavior_version[%u]\n"
-                      "\tschema object_version[%u]\n"
-                      "\tdomain behavior_version[%u]\n"
-                      "\tdomain w2k3_update_revision[%u]\n", 
-               o->forest->crossref_behavior_version,
-               o->forest->schema_object_version,
-               o->domain->behavior_version,
-               o->domain->w2k3_update_revision));
-
-       return NT_STATUS_OK;
-}
-
-static NTSTATUS test_become_dc_prepare_db(void *private_data,
-                                         const struct libnet_BecomeDC_PrepareDB *p)
+static NTSTATUS test_become_dc_prepare_db_ejs(void *private_data,
+                                             const struct libnet_BecomeDC_PrepareDB *p)
 {
        struct test_become_dc_state *s = talloc_get_type(private_data, struct test_become_dc_state);
        char *ejs;
        int ret;
        bool ok;
 
+       DEBUG(0,("Provision for Become-DC test using EJS\n"));
+
        DEBUG(0,("New Server[%s] in Site[%s]\n",
                p->dest_dsa->dns_name, p->dest_dsa->site_name));
 
@@ -152,14 +167,21 @@ static NTSTATUS test_become_dc_prepare_db(void *private_data,
                GUID_string(s, &p->dest_dsa->ntds_guid),
                GUID_string(s, &p->dest_dsa->invocation_id)));
 
-       DEBUG(0,("Schema Partition[%s]\n",
-               p->forest->schema_dn_str));
+       DEBUG(0,("Pathes under PRIVATEDIR[%s]\n"
+                "SAMDB[%s] SECRETS[%s] KEYTAB[%s]\n",
+               lp_private_dir(s->tctx->lp_ctx),
+               s->path.samdb_ldb,
+               s->path.secrets_ldb,
+               s->path.secrets_keytab));
+
+       DEBUG(0,("Schema Partition[%s => %s]\n",
+               p->forest->schema_dn_str, s->path.schemadn_ldb));
 
-       DEBUG(0,("Config Partition[%s]\n",
-               p->forest->config_dn_str));
+       DEBUG(0,("Config Partition[%s => %s]\n",
+               p->forest->config_dn_str, s->path.configdn_ldb));
 
-       DEBUG(0,("Domain Partition[%s]\n",
-               p->domain->dn_str));
+       DEBUG(0,("Domain Partition[%s => %s]\n",
+               p->domain->dn_str, s->path.domaindn_ldb));
 
        ejs = talloc_asprintf(s,
                "libinclude(\"base.js\");\n"
@@ -170,49 +192,50 @@ static NTSTATUS test_become_dc_prepare_db(void *private_data,
                "var subobj = provision_guess();\n"
                "subobj.ROOTDN       = \"%s\";\n"
                "subobj.DOMAINDN     = \"%s\";\n"
-               "subobj.DOMAINDN_LDB = \"test_domain.ldb\";\n"
+               "subobj.DOMAINDN_LDB = \"%s\";\n"
                "subobj.CONFIGDN     = \"%s\";\n"
-               "subobj.CONFIGDN_LDB = \"test_config.ldb\";\n"
+               "subobj.CONFIGDN_LDB = \"%s\";\n"
                "subobj.SCHEMADN     = \"%s\";\n"
-               "subobj.SCHEMADN_LDB = \"test_schema.ldb\";\n"
+               "subobj.SCHEMADN_LDB = \"%s\";\n"
                "subobj.HOSTNAME     = \"%s\";\n"
-               "subobj.DNSNAME      = \"%s\";\n"
+               "subobj.REALM        = \"%s\";\n"
+               "subobj.DOMAIN       = \"%s\";\n"
                "subobj.DEFAULTSITE  = \"%s\";\n"
                "\n"
-               "modules_list        = new Array(\"rootdse\",\n"
-               "                                \"kludge_acl\",\n"
-               "                                \"paged_results\",\n"
-               "                                \"server_sort\",\n"
-               "                                \"extended_dn\",\n"
-               "                                \"asq\",\n"
-               "                                \"samldb\",\n"
-               "                                \"password_hash\",\n"
-               "                                \"operational\",\n"
-               "                                \"objectclass\",\n"
-               "                                \"rdn_name\",\n"
-               "                                \"partition\");\n"
-               "subobj.MODULES_LIST = join(\",\", modules_list);\n"
-               "subobj.DOMAINDN_MOD = \"repl_meta_data\";\n"
-               "subobj.CONFIGDN_MOD = \"repl_meta_data\";\n"
-               "subobj.SCHEMADN_MOD = \"schema_fsmo,repl_meta_data\";\n"
+               "subobj.KRBTGTPASS   = \"_NOT_USED_\";\n"
+               "subobj.MACHINEPASS  = \"%s\";\n"
+               "subobj.ADMINPASS    = \"_NOT_USED_\";\n"
                "\n"
                "var paths = provision_default_paths(subobj);\n"
                "paths.samdb = \"%s\";\n"
+               "paths.secrets = \"%s\";\n"
+               "paths.templates = \"%s\";\n"
+               "paths.keytab = \"%s\";\n"
+               "paths.dns_keytab = \"%s\";\n"
                "\n"
                "var system_session = system_session();\n"
                "\n"
-               "var ok = provision_become_dc(subobj, message, paths, system_session);\n"
+               "var ok = provision_become_dc(subobj, message, true, paths, system_session);\n"
                "assert(ok);\n"
                "\n"
                "return 0;\n",
-               p->forest->root_dn_str,
-               p->domain->dn_str,
-               p->forest->config_dn_str,
-               p->forest->schema_dn_str,
-               p->dest_dsa->netbios_name,
-               p->dest_dsa->dns_name,
-               p->dest_dsa->site_name,
-               TORTURE_SAMDB_LDB);
+               p->forest->root_dn_str,         /* subobj.ROOTDN */
+               p->domain->dn_str,              /* subobj.DOMAINDN */
+               s->path.domaindn_ldb,           /* subobj.DOMAINDN_LDB */
+               p->forest->config_dn_str,       /* subobj.CONFIGDN */
+               s->path.configdn_ldb,           /* subobj.CONFIGDN_LDB */
+               p->forest->schema_dn_str,       /* subobj.SCHEMADN */
+               s->path.schemadn_ldb,           /* subobj.SCHEMADN_LDB */
+               p->dest_dsa->netbios_name,      /* subobj.HOSTNAME */
+               torture_join_dom_dns_name(s->tj),/* subobj.REALM */
+               torture_join_dom_netbios_name(s->tj),/* subobj.DOMAIN */
+               p->dest_dsa->site_name,         /* subobj.DEFAULTSITE */
+               cli_credentials_get_password(s->machine_account),/* subobj.MACHINEPASS */
+               s->path.samdb_ldb,              /* paths.samdb */
+               s->path.templates_ldb,          /* paths.templates */
+               s->path.secrets_ldb,            /* paths.secrets */
+               s->path.secrets_keytab,         /* paths.keytab */
+               s->path.dns_keytab);            /* paths.dns_keytab */
        NT_STATUS_HAVE_NO_MEMORY(ejs);
 
        ret = test_run_ejs(ejs);
@@ -226,14 +249,121 @@ static NTSTATUS test_become_dc_prepare_db(void *private_data,
 
        talloc_free(s->ldb);
 
-       DEBUG(0,("Open the SAM LDB with system credentials: %s\n", TORTURE_SAMDB_LDB));
+       DEBUG(0,("Open the SAM LDB with system credentials: %s\n", 
+                s->path.samdb_ldb));
 
-       s->ldb = ldb_wrap_connect(s, TORTURE_SAMDB_LDB,
-                                 system_session(s),
+       s->ldb = ldb_wrap_connect(s, s->tctx->lp_ctx, s->path.samdb_ldb,
+                                 system_session(s, s->tctx->lp_ctx),
                                  NULL, 0, NULL);
        if (!s->ldb) {
                DEBUG(0,("Failed to open '%s'\n",
-                       TORTURE_SAMDB_LDB));
+                       s->path.samdb_ldb));
+               return NT_STATUS_INTERNAL_DB_ERROR;
+       }
+
+       ok = samdb_set_ntds_invocation_id(s->ldb, &p->dest_dsa->invocation_id);
+       if (!ok) {
+               DEBUG(0,("Failed to set cached ntds invocationId\n"));
+               return NT_STATUS_FOOBAR;
+       }
+       ok = samdb_set_ntds_objectGUID(s->ldb, &p->dest_dsa->ntds_guid);
+       if (!ok) {
+               DEBUG(0,("Failed to set cached ntds objectGUID\n"));
+               return NT_STATUS_FOOBAR;
+       }
+
+       return NT_STATUS_OK;
+}
+
+#include "param/param.h"
+#include <Python.h>
+#include "scripting/python/modules.h"
+
+static NTSTATUS test_become_dc_prepare_db_py(void *private_data,
+                                            const struct libnet_BecomeDC_PrepareDB *p)
+{
+       struct test_become_dc_state *s = talloc_get_type(private_data, struct test_become_dc_state);
+       bool ok;
+       PyObject *provision_fn, *result, *parameters;
+
+       DEBUG(0,("Provision for Become-DC test using PYTHON\n"));
+
+       py_load_samba_modules();
+       Py_Initialize();
+
+       py_update_path("bin"); /* FIXME: Can't assume this always runs in source/... */
+
+       provision_fn = PyImport_Import(PyString_FromString("samba.provision.provision"));
+
+       if (provision_fn == NULL) {
+               DEBUG(0, ("Unable to import provision Python module.\n"));
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+       
+       DEBUG(0,("New Server[%s] in Site[%s]\n",
+               p->dest_dsa->dns_name, p->dest_dsa->site_name));
+
+       DEBUG(0,("DSA Instance [%s]\n"
+               "\tobjectGUID[%s]\n"
+               "\tinvocationId[%s]\n",
+               p->dest_dsa->ntds_dn_str,
+               GUID_string(s, &p->dest_dsa->ntds_guid),
+               GUID_string(s, &p->dest_dsa->invocation_id)));
+
+       DEBUG(0,("Pathes under PRIVATEDIR[%s]\n"
+                "SAMDB[%s] SECRETS[%s] KEYTAB[%s]\n",
+               lp_private_dir(s->tctx->lp_ctx),
+               s->path.samdb_ldb,
+               s->path.secrets_ldb,
+               s->path.secrets_keytab));
+
+       DEBUG(0,("Schema Partition[%s => %s]\n",
+               p->forest->schema_dn_str, s->path.schemadn_ldb));
+
+       DEBUG(0,("Config Partition[%s => %s]\n",
+               p->forest->config_dn_str, s->path.configdn_ldb));
+
+       DEBUG(0,("Domain Partition[%s => %s]\n",
+               p->domain->dn_str, s->path.domaindn_ldb));
+
+       parameters = PyDict_New();
+
+       PyDict_SetItemString(parameters, "rootdn", PyString_FromString(p->forest->root_dn_str));
+       PyDict_SetItemString(parameters, "domaindn", PyString_FromString(p->domain->dn_str));
+       PyDict_SetItemString(parameters, "domaindn_ldb", PyString_FromString(s->path.domaindn_ldb));
+       PyDict_SetItemString(parameters, "configdn", PyString_FromString(p->forest->config_dn_str));
+       PyDict_SetItemString(parameters, "configdn_ldb", PyString_FromString(s->path.configdn_ldb));
+       PyDict_SetItemString(parameters, "schema_dn_str", PyString_FromString(p->forest->schema_dn_str));
+       PyDict_SetItemString(parameters, "schemadn_ldb", PyString_FromString(s->path.schemadn_ldb));
+       PyDict_SetItemString(parameters, "netbios_name", PyString_FromString(p->dest_dsa->netbios_name));
+       PyDict_SetItemString(parameters, "dnsname", PyString_FromString(p->dest_dsa->dns_name));
+       PyDict_SetItemString(parameters, "defaultsite", PyString_FromString(p->dest_dsa->site_name));
+       PyDict_SetItemString(parameters, "machinepass", PyString_FromString(cli_credentials_get_password(s->machine_account)));
+       PyDict_SetItemString(parameters, "samdb", PyString_FromString(s->path.samdb_ldb));
+       PyDict_SetItemString(parameters, "secrets_ldb", PyString_FromString(s->path.secrets_ldb));
+       PyDict_SetItemString(parameters, "secrets_keytab", PyString_FromString(s->path.secrets_keytab));
+
+       result = PyEval_CallObjectWithKeywords(provision_fn, NULL, parameters);
+
+       Py_DECREF(parameters);
+
+       if (result == NULL) {
+               PyErr_Print();
+               PyErr_Clear();
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       talloc_free(s->ldb);
+
+       DEBUG(0,("Open the SAM LDB with system credentials: %s\n", 
+                s->path.samdb_ldb));
+
+       s->ldb = ldb_wrap_connect(s, s->tctx->lp_ctx, s->path.samdb_ldb,
+                                 system_session(s, s->tctx->lp_ctx),
+                                 NULL, 0, NULL);
+       if (!s->ldb) {
+               DEBUG(0,("Failed to open '%s'\n",
+                       s->path.samdb_ldb));
                return NT_STATUS_INTERNAL_DB_ERROR;
        }
 
@@ -317,7 +447,7 @@ static NTSTATUS test_apply_schema(struct test_become_dc_state *s,
 
        tmp_dns_name    = GUID_string(s_dsa->other_info, &s_dsa->source_dsa_obj_guid);
        NT_STATUS_HAVE_NO_MEMORY(tmp_dns_name);
-       tmp_dns_name    = talloc_asprintf_append(tmp_dns_name, "._msdcs.%s", c->forest->dns_name);
+       tmp_dns_name    = talloc_asprintf_append_buffer(tmp_dns_name, "._msdcs.%s", c->forest->dns_name);
        NT_STATUS_HAVE_NO_MEMORY(tmp_dns_name);
        s_dsa->other_info->dns_name = tmp_dns_name;
 
@@ -407,13 +537,14 @@ static NTSTATUS test_apply_schema(struct test_become_dc_state *s,
                                                         linked_attributes,
                                                         s_dsa,
                                                         uptodateness_vector,
+                                                        c->gensec_skey,
                                                         s, &objs);
        if (!W_ERROR_IS_OK(status)) {
                DEBUG(0,("Failed to commit objects: %s\n", win_errstr(status)));
                return werror_to_ntstatus(status);
        }
 
-       if (lp_parm_bool(-1, "become dc", "dump objects", False)) {
+       if (lp_parm_bool(s->tctx->lp_ctx, NULL, "become dc", "dump objects", false)) {
                for (i=0; i < objs->num_objects; i++) {
                        struct ldb_ldif ldif;
                        fprintf(stdout, "#\n");
@@ -454,13 +585,13 @@ static NTSTATUS test_apply_schema(struct test_become_dc_state *s,
        talloc_free(s->ldb); /* this also free's the s->schema, because dsdb_set_schema() steals it */
        s->schema = NULL;
 
-       DEBUG(0,("Reopen the SAM LDB with system credentials and a already stored schema: %s\n", TORTURE_SAMDB_LDB));
-       s->ldb = ldb_wrap_connect(s, TORTURE_SAMDB_LDB,
-                                 system_session(s),
+       DEBUG(0,("Reopen the SAM LDB with system credentials and a already stored schema: %s\n", s->path.samdb_ldb));
+       s->ldb = ldb_wrap_connect(s, s->tctx->lp_ctx, s->path.samdb_ldb,
+                                 system_session(s, s->tctx->lp_ctx),
                                  NULL, 0, NULL);
        if (!s->ldb) {
                DEBUG(0,("Failed to open '%s'\n",
-                       TORTURE_SAMDB_LDB));
+                       s->path.samdb_ldb));
                return NT_STATUS_INTERNAL_DB_ERROR;
        }
 
@@ -613,7 +744,7 @@ static NTSTATUS test_become_dc_store_chunk(void *private_data,
 
        tmp_dns_name    = GUID_string(s_dsa->other_info, &s_dsa->source_dsa_obj_guid);
        NT_STATUS_HAVE_NO_MEMORY(tmp_dns_name);
-       tmp_dns_name    = talloc_asprintf_append(tmp_dns_name, "._msdcs.%s", c->forest->dns_name);
+       tmp_dns_name    = talloc_asprintf_append_buffer(tmp_dns_name, "._msdcs.%s", c->forest->dns_name);
        NT_STATUS_HAVE_NO_MEMORY(tmp_dns_name);
        s_dsa->other_info->dns_name = tmp_dns_name;
 
@@ -634,13 +765,14 @@ static NTSTATUS test_become_dc_store_chunk(void *private_data,
                                                         linked_attributes,
                                                         s_dsa,
                                                         uptodateness_vector,
+                                                        c->gensec_skey,
                                                         s, &objs);
        if (!W_ERROR_IS_OK(status)) {
                DEBUG(0,("Failed to commit objects: %s\n", win_errstr(status)));
                return werror_to_ntstatus(status);
        }
 
-       if (lp_parm_bool(-1, "become dc", "dump objects", False)) {
+       if (lp_parm_bool(s->tctx->lp_ctx, NULL, "become dc", "dump objects", false)) {
                for (i=0; i < objs->num_objects; i++) {
                        struct ldb_ldif ldif;
                        fprintf(stdout, "#\n");
@@ -670,7 +802,7 @@ static NTSTATUS test_become_dc_store_chunk(void *private_data,
                        return NT_STATUS_FOOBAR;
                }
 
-               if (lp_parm_bool(-1, "become dc", "dump objects", False)) {
+               if (lp_parm_bool(s->tctx->lp_ctx, NULL, "become dc", "dump objects", false)) {
                        DEBUG(0,("# %s\n", sa->lDAPDisplayName));
                        NDR_PRINT_DEBUG(drsuapi_DsReplicaLinkedAttribute, &linked_attributes[i]);
                        dump_data(0,
@@ -682,28 +814,55 @@ static NTSTATUS test_become_dc_store_chunk(void *private_data,
        return NT_STATUS_OK;
 }
 
-BOOL torture_net_become_dc(struct torture_context *torture)
+bool torture_net_become_dc(struct torture_context *torture)
 {
-       BOOL ret = True;
+       bool ret = true;
        NTSTATUS status;
        struct libnet_BecomeDC b;
        struct libnet_UnbecomeDC u;
        struct test_become_dc_state *s;
+       struct ldb_message *msg;
+       int ldb_ret;
+       uint32_t i;
 
        s = talloc_zero(torture, struct test_become_dc_state);
-       if (!s) return False;
+       if (!s) return false;
+
+       s->tctx = torture;
+
+       s->netbios_name = lp_parm_string(torture->lp_ctx, NULL, "become dc", "smbtorture dc");
+       if (!s->netbios_name || !s->netbios_name[0]) {
+               s->netbios_name = "smbtorturedc";
+       }
+
+       s->path.samdb_ldb       = talloc_asprintf(s, "%s_samdb.ldb", s->netbios_name);
+       if (!s->path.samdb_ldb) return false;
+       s->path.domaindn_ldb    = talloc_asprintf(s, "%s_domain.ldb", s->netbios_name);
+       if (!s->path.domaindn_ldb) return false;
+       s->path.configdn_ldb    = talloc_asprintf(s, "%s_config.ldb", s->netbios_name);
+       if (!s->path.configdn_ldb) return false;
+       s->path.schemadn_ldb    = talloc_asprintf(s, "%s_schema.ldb", s->netbios_name);
+       if (!s->path.schemadn_ldb) return false;
+       s->path.secrets_ldb     = talloc_asprintf(s, "%s_secrets.ldb", s->netbios_name);
+       if (!s->path.secrets_ldb) return false;
+       s->path.templates_ldb   = talloc_asprintf(s, "%s_templates.ldb", s->netbios_name);
+       if (!s->path.templates_ldb) return false;
+       s->path.secrets_keytab  = talloc_asprintf(s, "%s_secrets.keytab", s->netbios_name);
+       if (!s->path.secrets_keytab) return false;
+       s->path.dns_keytab      = talloc_asprintf(s, "%s_dns.keytab", s->netbios_name);
+       if (!s->path.dns_keytab) return false;
 
        /* Join domain as a member server. */
-       s->tj = torture_join_domain(TORTURE_NETBIOS_NAME,
+       s->tj = torture_join_domain(torture, s->netbios_name,
                                 ACB_WSTRUST,
                                 &s->machine_account);
        if (!s->tj) {
                DEBUG(0, ("%s failed to join domain as workstation\n",
-                         TORTURE_NETBIOS_NAME));
-               return False;
+                         s->netbios_name));
+               return false;
        }
 
-       s->ctx = libnet_context_init(event_context_init(s));
+       s->ctx = libnet_context_init(torture->ev, torture->lp_ctx);
        s->ctx->cred = cmdline_credentials;
 
        s->ldb = ldb_init(s);
@@ -712,12 +871,15 @@ BOOL torture_net_become_dc(struct torture_context *torture)
        b.in.domain_dns_name            = torture_join_dom_dns_name(s->tj);
        b.in.domain_netbios_name        = torture_join_dom_netbios_name(s->tj);
        b.in.domain_sid                 = torture_join_sid(s->tj);
-       b.in.source_dsa_address         = lp_parm_string(-1, "torture", "host");
-       b.in.dest_dsa_netbios_name      = TORTURE_NETBIOS_NAME;
+       b.in.source_dsa_address         = torture_setting_string(torture, "host", NULL);
+       b.in.dest_dsa_netbios_name      = s->netbios_name;
 
        b.in.callbacks.private_data     = s;
        b.in.callbacks.check_options    = test_become_dc_check_options;
-       b.in.callbacks.prepare_db       = test_become_dc_prepare_db;
+       b.in.callbacks.prepare_db = test_become_dc_prepare_db_py;
+       if (getenv("PROVISION_EJS")) {
+               b.in.callbacks.prepare_db       = test_become_dc_prepare_db_ejs;
+       }
        b.in.callbacks.schema_chunk     = test_become_dc_schema_chunk;
        b.in.callbacks.config_chunk     = test_become_dc_store_chunk;
        b.in.callbacks.domain_chunk     = test_become_dc_store_chunk;
@@ -725,19 +887,80 @@ BOOL torture_net_become_dc(struct torture_context *torture)
        status = libnet_BecomeDC(s->ctx, s, &b);
        if (!NT_STATUS_IS_OK(status)) {
                printf("libnet_BecomeDC() failed - %s\n", nt_errstr(status));
-               ret = False;
+               ret = false;
+               goto cleanup;
+       }
+
+       msg = ldb_msg_new(s);
+       if (!msg) {
+               printf("ldb_msg_new() failed\n");
+               ret = false;
+               goto cleanup;
+       }
+       msg->dn = ldb_dn_new(msg, s->ldb, "@ROOTDSE");
+       if (!msg->dn) {
+               printf("ldb_msg_new(@ROOTDSE) failed\n");
+               ret = false;
+               goto cleanup;
+       }
+
+       ldb_ret = ldb_msg_add_string(msg, "isSynchronized", "TRUE");
+       if (ldb_ret != LDB_SUCCESS) {
+               printf("ldb_msg_add_string(msg, isSynchronized, TRUE) failed: %d\n", ldb_ret);
+               ret = false;
+               goto cleanup;
+       }
+
+       for (i=0; i < msg->num_elements; i++) {
+               msg->elements[i].flags = LDB_FLAG_MOD_REPLACE;
+       }
+
+       printf("mark ROOTDSE with isSynchronized=TRUE\n");
+       ldb_ret = ldb_modify(s->ldb, msg);
+       if (ldb_ret != LDB_SUCCESS) {
+               printf("ldb_modify() failed: %d\n", ldb_ret);
+               ret = false;
+               goto cleanup;
+       }
+       
+       /* reopen the ldb */
+       talloc_free(s->ldb); /* this also free's the s->schema, because dsdb_set_schema() steals it */
+       s->schema = NULL;
+
+       DEBUG(0,("Reopen the SAM LDB with system credentials and all replicated data: %s\n", s->path.samdb_ldb));
+       s->ldb = ldb_wrap_connect(s, torture->lp_ctx, s->path.samdb_ldb,
+                                 system_session(s, torture->lp_ctx),
+                                 NULL, 0, NULL);
+       if (!s->ldb) {
+               DEBUG(0,("Failed to open '%s'\n",
+                       s->path.samdb_ldb));
+               ret = false;
+               goto cleanup;
+       }
+
+       s->schema = dsdb_get_schema(s->ldb);
+       if (!s->schema) {
+               DEBUG(0,("Failed to get loaded dsdb_schema\n"));
+               ret = false;
+               goto cleanup;
+       }
+
+       if (lp_parm_bool(torture->lp_ctx, NULL, "become dc", "do not unjoin", false)) {
+               talloc_free(s);
+               return ret;
        }
 
+cleanup:
        ZERO_STRUCT(u);
        u.in.domain_dns_name            = torture_join_dom_dns_name(s->tj);
        u.in.domain_netbios_name        = torture_join_dom_netbios_name(s->tj);
-       u.in.source_dsa_address         = lp_parm_string(-1, "torture", "host");
-       u.in.dest_dsa_netbios_name      = TORTURE_NETBIOS_NAME;
+       u.in.source_dsa_address         = torture_setting_string(torture, "host", NULL);
+       u.in.dest_dsa_netbios_name      = s->netbios_name;
 
        status = libnet_UnbecomeDC(s->ctx, s, &u);
        if (!NT_STATUS_IS_OK(status)) {
                printf("libnet_UnbecomeDC() failed - %s\n", nt_errstr(status));
-               ret = False;
+               ret = false;
        }
 
        /* Leave domain. */