diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-10 18:41:55 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:49:17 +0100 |
| commit | f055893ca571fbeac3675c02344c7cc53106bea1 (patch) | |
| tree | 1dfa4dc151018102d18a219b9a6e20c1c78ae913 /source4/torture | |
| parent | 274d07ddff5c5920b9a2f3674e9104d8aab9e90c (diff) | |
| download | samba-f055893ca571fbeac3675c02344c7cc53106bea1.tar.gz samba-f055893ca571fbeac3675c02344c7cc53106bea1.tar.bz2 samba-f055893ca571fbeac3675c02344c7cc53106bea1.zip | |
r26382: Remove more uses of global_loadparm.
(This used to be commit 6d4c59853481855c232e7cf97264a391f40af2b5)
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/masktest.c | 2 | ||||
| -rw-r--r-- | source4/torture/nbt/winsreplication.c | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c index dab8193753..63ad6027a1 100644 --- a/source4/torture/masktest.c +++ b/source4/torture/masktest.c @@ -287,8 +287,6 @@ static void usage(void) setup_logging("masktest", DEBUG_STDOUT); - lp_set_cmdline(global_loadparm, "log level", "0"); - if (argc < 2 || argv[1][0] == '-') { usage(); exit(1); diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c index f67b6050f2..fc88d7fce1 100644 --- a/source4/torture/nbt/winsreplication.c +++ b/source4/torture/nbt/winsreplication.c @@ -107,10 +107,10 @@ static bool test_assoc_ctx1(struct torture_context *tctx) wrepl_socket2 = wrepl_socket_init(tctx, NULL); torture_comment(tctx, "Setup 2 wrepl connections\n"); - status = wrepl_connect(wrepl_socket1, NULL, address); + status = wrepl_connect(wrepl_socket1, lp_resolve_context(tctx->lp_ctx), NULL, address); CHECK_STATUS(tctx, status, NT_STATUS_OK); - status = wrepl_connect(wrepl_socket2, NULL, address); + status = wrepl_connect(wrepl_socket2, lp_resolve_context(tctx->lp_ctx), NULL, address); CHECK_STATUS(tctx, status, NT_STATUS_OK); torture_comment(tctx, "Send a start association request (conn1)\n"); @@ -189,7 +189,7 @@ static bool test_assoc_ctx2(struct torture_context *tctx) wrepl_socket = wrepl_socket_init(tctx, NULL); torture_comment(tctx, "Setup wrepl connections\n"); - status = wrepl_connect(wrepl_socket, NULL, address); + status = wrepl_connect(wrepl_socket, lp_resolve_context(tctx->lp_ctx), NULL, address); CHECK_STATUS(tctx, status, NT_STATUS_OK); torture_comment(tctx, "Send 1st start association request\n"); @@ -258,7 +258,7 @@ static bool test_wins_replication(struct torture_context *tctx) wrepl_socket = wrepl_socket_init(tctx, NULL); torture_comment(tctx, "Setup wrepl connections\n"); - status = wrepl_connect(wrepl_socket, NULL, address); + status = wrepl_connect(wrepl_socket, lp_resolve_context(tctx->lp_ctx), NULL, address); CHECK_STATUS(tctx, status, NT_STATUS_OK); torture_comment(tctx, "Send a start association request\n"); @@ -556,7 +556,7 @@ static struct test_wrepl_conflict_conn *test_create_conflict_ctx( if (!ctx->pull) return NULL; torture_comment(tctx, "Setup wrepl conflict pull connection\n"); - status = wrepl_connect(ctx->pull, NULL, ctx->address); + status = wrepl_connect(ctx->pull, lp_resolve_context(tctx->lp_ctx), NULL, ctx->address); if (!NT_STATUS_IS_OK(status)) return NULL; status = wrepl_associate(ctx->pull, &associate); @@ -721,7 +721,7 @@ static bool test_wrepl_update_one(struct torture_context *tctx, wrepl_socket = wrepl_socket_init(ctx, NULL); - status = wrepl_connect(wrepl_socket, NULL, ctx->address); + status = wrepl_connect(wrepl_socket, lp_resolve_context(tctx->lp_ctx), NULL, ctx->address); CHECK_STATUS(tctx, status, NT_STATUS_OK); status = wrepl_associate(wrepl_socket, &associate); |