Author: jelmer Date: 2007-12-07 01:16:50 +0000 (Fri, 07 Dec 2007) New Revision: 26326
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26326 Log: Remove more uses of global_loadparm. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/torture/libnet/libnet_BecomeDC.c Changeset: Property changes on: branches/SAMBA_4_0 ___________________________________________________________________ Name: bzr:revision-info ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/SAMBA_4_0/source/torture/libnet/libnet_BecomeDC.c =================================================================== --- branches/SAMBA_4_0/source/torture/libnet/libnet_BecomeDC.c 2007-12-06 23:57:22 UTC (rev 26325) +++ branches/SAMBA_4_0/source/torture/libnet/libnet_BecomeDC.c 2007-12-07 01:16:50 UTC (rev 26326) @@ -95,6 +95,7 @@ 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 @@ 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)); @@ -443,7 +444,7 @@ 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"); @@ -485,8 +486,8 @@ 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, global_loadparm), + 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", @@ -671,7 +672,7 @@ 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"); @@ -701,7 +702,7 @@ 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, @@ -727,6 +728,8 @@ s = talloc_zero(torture, struct test_become_dc_state); 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";
