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/libcli/resolve/resolve.c | |
| 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/libcli/resolve/resolve.c')
| -rw-r--r-- | source4/libcli/resolve/resolve.c | 6 |
1 files changed, 2 insertions, 4 deletions
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); } |