Add context for libcli_resolve.

[samba-svnmirror.git] / source / torture / nbt / dgram.c

diff --git a/source/torture/nbt/dgram.c b/source/torture/nbt/dgram.c
index ff1a7b97cb6fdc20121efe7df2ece6ac8f8088e9..37d445cac4f114ae6a4172493b26dcfadb05c064 100644 (file)
--- a/source/torture/nbt/dgram.c
+++ b/source/torture/nbt/dgram.c
@@ -84,10 +84,10 @@ static bool nbt_test_netlogon(struct torture_context *tctx)
 
        /* do an initial name resolution to find its IP */
        torture_assert_ntstatus_ok(tctx, 
-                                  resolve_name(&name, tctx, &address, event_context_find(tctx), lp_name_resolve_order(global_loadparm)),
+                                  resolve_name(lp_resolve_context(tctx->lp_ctx), &name, tctx, &address, event_context_find(tctx)),
                                   talloc_asprintf(tctx, "Failed to resolve %s", name.name));
 
-       myaddress = talloc_strdup(dgmsock, iface_best_ip(address));
+       myaddress = talloc_strdup(dgmsock, iface_best_ip(tctx->lp_ctx, address));
 
 
        socket_address = socket_address_from_strings(dgmsock, dgmsock->sock->backend_name,
@@ -124,7 +124,7 @@ static bool nbt_test_netlogon(struct torture_context *tctx)
        make_nbt_name_client(&myname, TEST_NAME);
 
        dest = socket_address_from_strings(dgmsock, dgmsock->sock->backend_name, 
-                                          address, 0);
+                                          address, lp_dgram_port(tctx->lp_ctx));
        torture_assert(tctx, dest != NULL, "Error getting address");
 
        status = dgram_mailslot_netlogon_send(dgmsock, &name, dest,
@@ -163,10 +163,10 @@ static bool nbt_test_netlogon2(struct torture_context *tctx)
 
        /* do an initial name resolution to find its IP */
        torture_assert_ntstatus_ok(tctx, 
-                                  resolve_name(&name, tctx, &address, event_context_find(tctx), lp_name_resolve_order(tctx->lp_ctx)),
+                                  resolve_name(lp_resolve_context(tctx->lp_ctx), &name, tctx, &address, event_context_find(tctx)),
                                   talloc_asprintf(tctx, "Failed to resolve %s", name.name));
 
-       myaddress = talloc_strdup(dgmsock, iface_best_ip(address));
+       myaddress = talloc_strdup(dgmsock, iface_best_ip(tctx->lp_ctx, address));
 
        socket_address = socket_address_from_strings(dgmsock, dgmsock->sock->backend_name,
                                                     myaddress, lp_dgram_port(tctx->lp_ctx));
@@ -204,7 +204,7 @@ static bool nbt_test_netlogon2(struct torture_context *tctx)
        make_nbt_name_client(&myname, TEST_NAME);
 
        dest = socket_address_from_strings(dgmsock, dgmsock->sock->backend_name, 
-                                          address, 0);
+                                          address, lp_dgram_port(tctx->lp_ctx));
 
        torture_assert(tctx, dest != NULL, "Error getting address");
        status = dgram_mailslot_netlogon_send(dgmsock, &name, dest,
@@ -272,10 +272,10 @@ 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(&name, tctx, &address, event_context_find(tctx), lp_name_resolve_order(tctx->lp_ctx)), 
+                                  resolve_name(lp_resolve_context(tctx->lp_ctx), &name, tctx, &address, event_context_find(tctx)), 
                                   talloc_asprintf(tctx, "Failed to resolve %s", name.name));
 
-       myaddress = talloc_strdup(dgmsock, iface_best_ip(address));
+       myaddress = talloc_strdup(dgmsock, iface_best_ip(tctx->lp_ctx, address));
 
        socket_address = socket_address_from_strings(dgmsock, dgmsock->sock->backend_name,
                                                     myaddress, lp_dgram_port(tctx->lp_ctx));
@@ -323,7 +323,7 @@ static bool nbt_test_ntlogon(struct torture_context *tctx)
        make_nbt_name_client(&myname, TEST_NAME);
 
        dest = socket_address_from_strings(dgmsock, dgmsock->sock->backend_name, 
-                                          address, 0);
+                                          address, lp_dgram_port(tctx->lp_ctx));
        torture_assert(tctx, dest != NULL, "Error getting address");
        status = dgram_mailslot_ntlogon_send(dgmsock, DGRAM_DIRECT_UNIQUE,
                                             &name, dest, &myname, &logon);