summaryrefslogtreecommitdiff
path: root/source4/torture/raw/composite.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-04-22 10:21:22 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-04-22 10:21:22 +0200
commit38a4f9df170fba0a05755e06dd4362d471b3db80 (patch)
treea1f3623e06ce4fd1e010afd5e72062dbee0d9b83 /source4/torture/raw/composite.c
parent54efc107e58ed1eed7109ea08fdf808e3a15327b (diff)
parent7dddab3f6cdb36a537ca3ed9c9f3461993d1c11c (diff)
downloadsamba-38a4f9df170fba0a05755e06dd4362d471b3db80.tar.gz
samba-38a4f9df170fba0a05755e06dd4362d471b3db80.tar.bz2
samba-38a4f9df170fba0a05755e06dd4362d471b3db80.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 1e38de45640430be002053b8bd52b615184134ba)
Diffstat (limited to 'source4/torture/raw/composite.c')
-rw-r--r--source4/torture/raw/composite.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/torture/raw/composite.c b/source4/torture/raw/composite.c
index 1f31fbc515..d73ac1327e 100644
--- a/source4/torture/raw/composite.c
+++ b/source4/torture/raw/composite.c
@@ -296,7 +296,7 @@ static bool test_appendacl(struct smbcli_state *cli, struct torture_context *tct
c[i]->async.private_data = count;
}
- event_ctx = talloc_reference(tctx, cli->tree->session->transport->socket->event.ctx);
+ event_ctx = tctx->ev;
printf("waiting for completion\n");
while (*count != num_ops) {
event_loop_once(event_ctx);
@@ -354,7 +354,7 @@ static bool test_fsinfo(struct smbcli_state *cli, struct torture_context *tctx)
printf("testing parallel queryfsinfo [Object ID] with %d ops\n", torture_numops);
- event_ctx = talloc_reference(tctx, cli->tree->session->transport->socket->event.ctx);
+ event_ctx = tctx->ev;
c = talloc_array(tctx, struct composite_context *, torture_numops);
for (i=0; i<torture_numops; i++) {