diff options
author | Simo Sorce <idra@samba.org> | 2010-07-16 09:57:03 -0400 |
---|---|---|
committer | Simo Sorce <idra@samba.org> | 2010-07-16 09:57:03 -0400 |
commit | 378e4d5b8d30733f0f28cc2bceb28d9b9b594707 (patch) | |
tree | 9f6faebdcf58c73e0297bfdf3b905ef256f8e478 /source4/lib/messaging/tests/messaging.c | |
parent | 2f249538ac8f2a54d9c8f8dbf0107db2f33bfe16 (diff) | |
parent | 6b266b85cf34145ac1f03d8f787b81121e4ec92b (diff) | |
download | samba-378e4d5b8d30733f0f28cc2bceb28d9b9b594707.tar.gz samba-378e4d5b8d30733f0f28cc2bceb28d9b9b594707.tar.bz2 samba-378e4d5b8d30733f0f28cc2bceb28d9b9b594707.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source4/lib/messaging/tests/messaging.c')
-rw-r--r-- | source4/lib/messaging/tests/messaging.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/lib/messaging/tests/messaging.c b/source4/lib/messaging/tests/messaging.c index 96cb180ff7..bf6f13bc67 100644 --- a/source4/lib/messaging/tests/messaging.c +++ b/source4/lib/messaging/tests/messaging.c @@ -67,12 +67,12 @@ static bool test_ping_speed(struct torture_context *tctx) int timelimit = torture_setting_int(tctx, "timelimit", 10); uint32_t msg_ping, msg_exit; - lp_set_cmdline(tctx->lp_ctx, "pid directory", "piddir.tmp"); + lpcfg_set_cmdline(tctx->lp_ctx, "pid directory", "piddir.tmp"); ev = tctx->ev; msg_server_ctx = messaging_init(tctx, - lp_messaging_path(tctx, tctx->lp_ctx), cluster_id(0, 1), + lpcfg_messaging_path(tctx, tctx->lp_ctx), cluster_id(0, 1), ev); 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) messaging_register_tmp(msg_server_ctx, tctx, exit_message, &msg_exit); msg_client_ctx = messaging_init(tctx, - lp_messaging_path(tctx, tctx->lp_ctx), + lpcfg_messaging_path(tctx, tctx->lp_ctx), cluster_id(0, 2), ev); |