diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-03 18:47:35 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:47:39 +0100 |
| commit | 1fbdd6ef1dfb8704de0524fc6f5c33e1418858cd (patch) | |
| tree | 3e8c16ffd419fbd950fcef1569f0bc82709f5831 /source4/torture/nbt | |
| parent | cb7c72a0ef9a8e6d145ead6286e54ec50ddf3988 (diff) | |
| download | samba-1fbdd6ef1dfb8704de0524fc6f5c33e1418858cd.tar.gz samba-1fbdd6ef1dfb8704de0524fc6f5c33e1418858cd.tar.bz2 samba-1fbdd6ef1dfb8704de0524fc6f5c33e1418858cd.zip | |
r26264: pass name resolve order explicitly, use torture context for settings in dssync tests.
(This used to be commit c7eae1c7842f9ff8b70cce9e5d6f3ebbbe78e83b)
Diffstat (limited to 'source4/torture/nbt')
| -rw-r--r-- | source4/torture/nbt/dgram.c | 6 | ||||
| -rw-r--r-- | source4/torture/nbt/nbt.c | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/source4/torture/nbt/dgram.c b/source4/torture/nbt/dgram.c index 82d0617696..ff1a7b97cb 100644 --- a/source4/torture/nbt/dgram.c +++ b/source4/torture/nbt/dgram.c @@ -84,7 +84,7 @@ 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)), + resolve_name(&name, tctx, &address, event_context_find(tctx), lp_name_resolve_order(global_loadparm)), talloc_asprintf(tctx, "Failed to resolve %s", name.name)); myaddress = talloc_strdup(dgmsock, iface_best_ip(address)); @@ -163,7 +163,7 @@ 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)), + resolve_name(&name, tctx, &address, event_context_find(tctx), lp_name_resolve_order(tctx->lp_ctx)), talloc_asprintf(tctx, "Failed to resolve %s", name.name)); myaddress = talloc_strdup(dgmsock, iface_best_ip(address)); @@ -272,7 +272,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(&name, tctx, &address, event_context_find(tctx)), + resolve_name(&name, tctx, &address, event_context_find(tctx), lp_name_resolve_order(tctx->lp_ctx)), talloc_asprintf(tctx, "Failed to resolve %s", name.name)); myaddress = talloc_strdup(dgmsock, iface_best_ip(address)); diff --git a/source4/torture/nbt/nbt.c b/source4/torture/nbt/nbt.c index 2a3678ee75..7cf2a48c4e 100644 --- a/source4/torture/nbt/nbt.c +++ b/source4/torture/nbt/nbt.c @@ -23,6 +23,7 @@ #include "torture/nbt/proto.h" #include "torture/ui.h" #include "libcli/resolve/resolve.h" +#include "param/param.h" bool torture_nbt_get_name(struct torture_context *tctx, struct nbt_name *name, @@ -33,7 +34,7 @@ bool torture_nbt_get_name(struct torture_context *tctx, /* do an initial name resolution to find its IP */ torture_assert_ntstatus_ok(tctx, - resolve_name(name, tctx, address, NULL), + resolve_name(name, tctx, address, NULL, lp_name_resolve_order(tctx->lp_ctx)), talloc_asprintf(tctx, "Failed to resolve %s", name->name)); |