diff options
| author | Andrew Tridgell <tridge@samba.org> | 2007-05-17 08:47:04 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:52:34 -0500 |
| commit | c42219d7352bd2e7a6413f7ae1cd0fd5cded1d95 (patch) | |
| tree | c45f3949f0e5f434f129c6346a99d3fa0aab96df /source4/torture/local | |
| parent | ad1cde253e5938acf2c57458b5af04f32f45edbf (diff) | |
| download | samba-c42219d7352bd2e7a6413f7ae1cd0fd5cded1d95.tar.gz samba-c42219d7352bd2e7a6413f7ae1cd0fd5cded1d95.tar.bz2 samba-c42219d7352bd2e7a6413f7ae1cd0fd5cded1d95.zip | |
r22969: fix some more places where we could end up with more than one event
context. We now have an event context on the torture_context, and we
can also get one from the cli_credentials structure
(This used to be commit c0f65eb6562e13530337c23e3447a6aa6eb8fc17)
Diffstat (limited to 'source4/torture/local')
| -rw-r--r-- | source4/torture/local/irpc.c | 2 | ||||
| -rw-r--r-- | source4/torture/local/messaging.c | 2 | ||||
| -rw-r--r-- | source4/torture/local/resolve.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source4/torture/local/irpc.c b/source4/torture/local/irpc.c index bd52be09e2..3c177c4ece 100644 --- a/source4/torture/local/irpc.c +++ b/source4/torture/local/irpc.c @@ -217,7 +217,7 @@ static BOOL irpc_setup(struct torture_context *tctx, void **_data) lp_set_cmdline("lock dir", "lockdir.tmp"); - data->ev = event_context_init(tctx); + data->ev = tctx->ev; torture_assert(tctx, data->msg_ctx1 = messaging_init(tctx, cluster_id(MSG_ID1), data->ev), diff --git a/source4/torture/local/messaging.c b/source4/torture/local/messaging.c index f6ae8a3e8c..ce9928d91d 100644 --- a/source4/torture/local/messaging.c +++ b/source4/torture/local/messaging.c @@ -70,7 +70,7 @@ static bool test_ping_speed(struct torture_context *tctx) lp_set_cmdline("pid directory", "piddir.tmp"); - ev = event_context_init(mem_ctx); + ev = tctx->ev; msg_server_ctx = messaging_init(mem_ctx, cluster_id(1), ev); diff --git a/source4/torture/local/resolve.c b/source4/torture/local/resolve.c index 21a7392a14..d3bae21184 100644 --- a/source4/torture/local/resolve.c +++ b/source4/torture/local/resolve.c @@ -35,7 +35,7 @@ static bool test_async_resolve(struct torture_context *tctx) struct timeval tv = timeval_current(); TALLOC_CTX *mem_ctx = tctx; - ev = event_context_init(mem_ctx); + ev = tctx->ev; ZERO_STRUCT(n); n.name = host; |