diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-10-13 20:01:56 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-10-13 14:06:07 +0200 |
| commit | 3cdb1fe4404e26ae383cfb73bfa8af36cb1d7f7c (patch) | |
| tree | ed1f1f37b4ecbb887fa391da340de0c044e9dec7 /source4/lib/messaging/tests | |
| parent | 5603dab6478fbb40206a8664a308b5db5b1863e8 (diff) | |
| download | samba-3cdb1fe4404e26ae383cfb73bfa8af36cb1d7f7c.tar.gz samba-3cdb1fe4404e26ae383cfb73bfa8af36cb1d7f7c.tar.bz2 samba-3cdb1fe4404e26ae383cfb73bfa8af36cb1d7f7c.zip | |
s4-messaging: Pass the loadparm context, not just the messaging path
This will allow the TDB layer to get at the lp_ctx for tdb options.
Andrew Bartlett
Diffstat (limited to 'source4/lib/messaging/tests')
| -rw-r--r-- | source4/lib/messaging/tests/irpc.c | 4 | ||||
| -rw-r--r-- | source4/lib/messaging/tests/messaging.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/lib/messaging/tests/irpc.c b/source4/lib/messaging/tests/irpc.c index c94765a167..83361073b8 100644 --- a/source4/lib/messaging/tests/irpc.c +++ b/source4/lib/messaging/tests/irpc.c @@ -247,14 +247,14 @@ static bool irpc_setup(struct torture_context *tctx, void **_data) data->ev = tctx->ev; torture_assert(tctx, data->msg_ctx1 = imessaging_init(tctx, - lpcfg_imessaging_path(tctx, tctx->lp_ctx), + tctx->lp_ctx, cluster_id(0, MSG_ID1), data->ev, true), "Failed to init first messaging context"); torture_assert(tctx, data->msg_ctx2 = imessaging_init(tctx, - lpcfg_imessaging_path(tctx, tctx->lp_ctx), + tctx->lp_ctx, cluster_id(0, MSG_ID2), data->ev, true), "Failed to init second messaging context"); diff --git a/source4/lib/messaging/tests/messaging.c b/source4/lib/messaging/tests/messaging.c index c17b95e9c4..b6d1c35d1e 100644 --- a/source4/lib/messaging/tests/messaging.c +++ b/source4/lib/messaging/tests/messaging.c @@ -72,7 +72,7 @@ static bool test_ping_speed(struct torture_context *tctx) ev = tctx->ev; msg_server_ctx = imessaging_init(tctx, - lpcfg_imessaging_path(tctx, tctx->lp_ctx), cluster_id(0, 1), + tctx->lp_ctx, cluster_id(0, 1), ev, true); torture_assert(tctx, msg_server_ctx != NULL, "Failed to init ping messaging context"); @@ -81,7 +81,7 @@ static bool test_ping_speed(struct torture_context *tctx) imessaging_register_tmp(msg_server_ctx, tctx, exit_message, &msg_exit); msg_client_ctx = imessaging_init(tctx, - lpcfg_imessaging_path(tctx, tctx->lp_ctx), + tctx->lp_ctx, cluster_id(0, 2), ev, true); |