summaryrefslogtreecommitdiff
path: root/source4/libcli
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-03 18:47:35 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:47:39 +0100
commit1fbdd6ef1dfb8704de0524fc6f5c33e1418858cd (patch)
tree3e8c16ffd419fbd950fcef1569f0bc82709f5831 /source4/libcli
parentcb7c72a0ef9a8e6d145ead6286e54ec50ddf3988 (diff)
downloadsamba-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/libcli')
-rw-r--r--source4/libcli/finddcs.c3
-rw-r--r--source4/libcli/raw/clisocket.c2
-rw-r--r--source4/libcli/resolve/resolve.c6
3 files changed, 4 insertions, 7 deletions
diff --git a/source4/libcli/finddcs.c b/source4/libcli/finddcs.c
index e00697fe17..75dc14e3f4 100644
--- a/source4/libcli/finddcs.c
+++ b/source4/libcli/finddcs.c
@@ -93,8 +93,7 @@ struct composite_context *finddcs_send(TALLOC_CTX *mem_ctx,
state->msg_ctx = msg_ctx;
make_nbt_name(&name, state->domain_name, name_type);
- creq = resolve_name_send(&name, event_ctx,
- methods);
+ creq = resolve_name_send(&name, event_ctx, methods);
composite_continue(c, creq, finddcs_name_resolved, state);
return c;
}
diff --git a/source4/libcli/raw/clisocket.c b/source4/libcli/raw/clisocket.c
index a748b40a32..e3420313c5 100644
--- a/source4/libcli/raw/clisocket.c
+++ b/source4/libcli/raw/clisocket.c
@@ -239,7 +239,7 @@ struct smbcli_socket *smbcli_sock_connect_byname(const char *host, int port,
make_nbt_name(&nbt_name, host, name_type);
- status = resolve_name(&nbt_name, tmp_ctx, &address, event_ctx);
+ status = resolve_name(&nbt_name, tmp_ctx, &address, event_ctx, lp_name_resolve_order(global_loadparm));
if (!NT_STATUS_IS_OK(status)) {
talloc_free(tmp_ctx);
return NULL;
diff --git a/source4/libcli/resolve/resolve.c b/source4/libcli/resolve/resolve.c
index 24113db9f0..0f8839a3b7 100644
--- a/source4/libcli/resolve/resolve.c
+++ b/source4/libcli/resolve/resolve.c
@@ -187,11 +187,9 @@ NTSTATUS resolve_name_recv(struct composite_context *c,
/*
general name resolution - sync call
*/
-NTSTATUS resolve_name(struct nbt_name *name, TALLOC_CTX *mem_ctx, const char **reply_addr,
- struct event_context *ev)
+NTSTATUS resolve_name(struct nbt_name *name, TALLOC_CTX *mem_ctx, const char **reply_addr, struct event_context *ev, const char **name_resolve_order)
{
- struct composite_context *c = resolve_name_send(name, ev,
- lp_name_resolve_order(global_loadparm));
+ struct composite_context *c = resolve_name_send(name, ev, name_resolve_order);
return resolve_name_recv(c, mem_ctx, reply_addr);
}