Avoid using event_context_find where possible.

diff --git a/source/torture/libnet/domain.c b/source/torture/libnet/domain.c
index ff1fbcab7885e11b1a66100d82c46044edb1a56d..ab7846e5e11a04f32b514353fe65a9c92fc23dd3 100644 (file)
--- a/source/torture/libnet/domain.c
+++ b/source/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/source/torture/nbt/dgram.c b/source/torture/nbt/dgram.c
index 18950e9dcb448c47426ea8d1dfa99440a9d1ad6f..a4c8be888cf7fe90b019e6703518c8beea4cd02c 100644 (file)
--- a/source/torture/nbt/dgram.c
+++ b/source/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);