diff options
| author | Rafal Szczesniak <mimir@samba.org> | 2005-06-21 20:18:08 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:18:38 -0500 |
| commit | 338bc0f58aef55f4b5820b97b234d2507d1ea236 (patch) | |
| tree | c4af9bc4d16b8147208ff13355a61ef51714cb21 /source4 | |
| parent | bec00581247c9062ea0acce6037ef75ab188548c (diff) | |
| download | samba-338bc0f58aef55f4b5820b97b234d2507d1ea236.tar.gz samba-338bc0f58aef55f4b5820b97b234d2507d1ea236.tar.bz2 samba-338bc0f58aef55f4b5820b97b234d2507d1ea236.zip | |
r7813: Make async request independent from config file routines.
rafal
(This used to be commit 84315cdf0d535ed0fe43bfc7cc4c83bc405c2cfb)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/libcli/resolve/resolve.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/source4/libcli/resolve/resolve.c b/source4/libcli/resolve/resolve.c index 0b7c359ca1..b87f9abe89 100644 --- a/source4/libcli/resolve/resolve.c +++ b/source4/libcli/resolve/resolve.c @@ -132,16 +132,8 @@ struct composite_context *resolve_name_send(struct nbt_name *name, struct event_ status = nbt_name_dup(state, name, &state->name); if (!NT_STATUS_IS_OK(status)) goto failed; - /* use default methods from config file if not passed explicitly */ - if (methods == NULL) { - state->methods = lp_name_resolve_order(); - if (state->methods == NULL) { - return NULL; - } - - } else { - state->methods = methods; - } + if (methods == NULL) goto failed; + state->methods = methods; c->state = SMBCLI_REQUEST_SEND; c->private = state; @@ -186,7 +178,7 @@ NTSTATUS resolve_name_recv(struct composite_context *c, */ NTSTATUS resolve_name(struct nbt_name *name, TALLOC_CTX *mem_ctx, const char **reply_addr) { - struct composite_context *c = resolve_name_send(name, NULL, NULL); + struct composite_context *c = resolve_name_send(name, NULL, lp_name_resolve_order()); return resolve_name_recv(c, mem_ctx, reply_addr); } |