summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-04-17 01:37:02 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-04-17 01:37:02 +0200
commita145d21de63a5cb2d347c1281ed437cab6a95569 (patch)
tree7647a130103bbc24d7762f82446333365d3ac778 /source4
parent9de0594175f9ccd9c130a332126f9247758c43ad (diff)
downloadsamba-a145d21de63a5cb2d347c1281ed437cab6a95569.tar.gz
samba-a145d21de63a5cb2d347c1281ed437cab6a95569.tar.bz2
samba-a145d21de63a5cb2d347c1281ed437cab6a95569.zip
Avoid using event_context_find where possible.
(This used to be commit 04420b4689bc223202d5bba871e3eea16301e8e9)
Diffstat (limited to 'source4')
-rw-r--r--source4/torture/libnet/domain.c4
-rw-r--r--source4/torture/nbt/dgram.c2
2 files changed, 2 insertions, 4 deletions
diff --git a/source4/torture/libnet/domain.c b/source4/torture/libnet/domain.c
index ff1fbcab78..ab7846e5e1 100644
--- a/source4/torture/libnet/domain.c
+++ b/source4/torture/libnet/domain.c
@@ -74,7 +74,6 @@ bool torture_domainopen(struct torture_context *torture)
{
NTSTATUS status;
struct libnet_context *net_ctx;
- struct event_context *evt_ctx;
TALLOC_CTX *mem_ctx;
bool ret = true;
struct policy_handle h;
@@ -82,8 +81,7 @@ bool torture_domainopen(struct torture_context *torture)
mem_ctx = talloc_init("test_domain_open");
- evt_ctx = event_context_find(torture);
- net_ctx = libnet_context_init(evt_ctx, torture->lp_ctx);
+ net_ctx = libnet_context_init(torture->ev, torture->lp_ctx);
status = torture_rpc_connection(torture,
&net_ctx->samr.pipe,
diff --git a/source4/torture/nbt/dgram.c b/source4/torture/nbt/dgram.c
index 18950e9dcb..a4c8be888c 100644
--- a/source4/torture/nbt/dgram.c
+++ b/source4/torture/nbt/dgram.c
@@ -283,7 +283,7 @@ static bool nbt_test_ntlogon(struct torture_context *tctx)
/* do an initial name resolution to find its IP */
torture_assert_ntstatus_ok(tctx,
- resolve_name(lp_resolve_context(tctx->lp_ctx), &name, tctx, &address, event_context_find(tctx)),
+ resolve_name(lp_resolve_context(tctx->lp_ctx), &name, tctx, &address, tctx->ev),
talloc_asprintf(tctx, "Failed to resolve %s", name.name));
load_interfaces(tctx, lp_interfaces(tctx->lp_ctx), &ifaces);