r26327: Explicit loadparm_context for RPC client functions.

[jelmer/samba4-debian.git] / source / torture / libnet / libnet_BecomeDC.c

diff --git a/source/torture/libnet/libnet_BecomeDC.c b/source/torture/libnet/libnet_BecomeDC.c
index 65d4deaaa4a5f095d34335b178c7573fdf1c79ed..1eaed12701110d8b7b1fe47b1eaed88024e53768 100644 (file)
--- a/source/torture/libnet/libnet_BecomeDC.c
+++ b/source/torture/libnet/libnet_BecomeDC.c
@@ -35,7 +35,7 @@
 #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"
 #include "lib/appweb/ejs/ejs.h"
 #include "lib/appweb/ejs/ejsInternal.h"
 #include "scripting/ejs/smbcalls.h"
@@ -95,6 +95,7 @@ failed:
 
 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;
@@ -163,7 +164,7 @@ static NTSTATUS test_become_dc_prepare_db(void *private_data,
 
        DEBUG(0,("Pathes under PRIVATEDIR[%s]\n"
                 "SAMDB[%s] SECRETS[%s] KEYTAB[%s]\n",
-               lp_private_dir(global_loadparm),
+               lp_private_dir(s->tctx->lp_ctx),
                s->path.samdb_ldb,
                s->path.secrets_ldb,
                s->path.secrets_keytab));
@@ -254,10 +255,11 @@ 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", s->path.samdb_ldb));
+       DEBUG(0,("Open the SAM LDB with system credentials: %s\n", 
+                s->path.samdb_ldb));
 
-       s->ldb = ldb_wrap_connect(s, global_loadparm, s->path.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",
@@ -442,7 +444,7 @@ static NTSTATUS test_apply_schema(struct test_become_dc_state *s,
                return werror_to_ntstatus(status);
        }
 
-       if (lp_parm_bool(global_loadparm, NULL, "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");
@@ -484,8 +486,8 @@ static NTSTATUS test_apply_schema(struct test_become_dc_state *s,
        s->schema = NULL;
 
        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, global_loadparm, s->path.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",
@@ -670,7 +672,7 @@ static NTSTATUS test_become_dc_store_chunk(void *private_data,
                return werror_to_ntstatus(status);
        }
 
-       if (lp_parm_bool(global_loadparm, NULL, "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");
@@ -700,7 +702,7 @@ static NTSTATUS test_become_dc_store_chunk(void *private_data,
                        return NT_STATUS_FOOBAR;
                }
 
-               if (lp_parm_bool(global_loadparm, NULL, "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,
@@ -726,7 +728,9 @@ bool torture_net_become_dc(struct torture_context *torture)
        s = talloc_zero(torture, struct test_become_dc_state);
        if (!s) return false;
 
-       s->netbios_name = lp_parm_string(global_loadparm, NULL, "become dc", "smbtorture dc");
+       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";
        }
@@ -745,7 +749,7 @@ bool torture_net_become_dc(struct torture_context *torture)
        if (!s->path.secrets_keytab) return false;
 
        /* Join domain as a member server. */
-       s->tj = torture_join_domain(s->netbios_name,
+       s->tj = torture_join_domain(torture, s->netbios_name,
                                 ACB_WSTRUST,
                                 &s->machine_account);
        if (!s->tj) {
@@ -754,7 +758,7 @@ bool torture_net_become_dc(struct torture_context *torture)
                return false;
        }
 
-       s->ctx = libnet_context_init(torture->ev);
+       s->ctx = libnet_context_init(torture->ev, torture->lp_ctx);
        s->ctx->cred = cmdline_credentials;
 
        s->ldb = ldb_init(s);
@@ -817,8 +821,8 @@ bool torture_net_become_dc(struct torture_context *torture)
        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, global_loadparm, s->path.samdb_ldb,
-                                 system_session(s),
+       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",
@@ -834,7 +838,7 @@ bool torture_net_become_dc(struct torture_context *torture)
                goto cleanup;
        }
 
-       if (lp_parm_bool(global_loadparm, NULL, "become dc", "do not unjoin", false)) {
+       if (lp_parm_bool(torture->lp_ctx, NULL, "become dc", "do not unjoin", false)) {
                talloc_free(s);
                return ret;
        }