Author: mimir Date: 2005-06-21 20:18:08 +0000 (Tue, 21 Jun 2005) New Revision: 7813
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7813 Log: Make async request independent from config file routines. rafal Modified: branches/SAMBA_4_0/source/libcli/resolve/resolve.c Changeset: Modified: branches/SAMBA_4_0/source/libcli/resolve/resolve.c =================================================================== --- branches/SAMBA_4_0/source/libcli/resolve/resolve.c 2005-06-21 18:43:12 UTC (rev 7812) +++ branches/SAMBA_4_0/source/libcli/resolve/resolve.c 2005-06-21 20:18:08 UTC (rev 7813) @@ -132,17 +132,9 @@ 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; - } + if (methods == NULL) goto failed; + state->methods = methods; - } else { - state->methods = methods; - } - c->state = SMBCLI_REQUEST_SEND; c->private = state; if (event_ctx == NULL) { @@ -186,7 +178,7 @@ */ 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); }
