sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

r7813: Make async request independent from config file routines.

Browse Source 
rafal
(This used to be commit 84315cdf0d)
This commit is contained in:
Rafal Szczesniak 2005-06-21 20:18:08 +00:00 committed by Gerald (Jerry) Carter
parent bec0058124
commit 338bc0f58a
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source4/libcli/resolve/resolve.c
View File

@ -132,16 +132,8 @@ struct composite_context *resolve_name_send(struct nbt_name *name, struct event_
status = nbt_name_dup(state, name, &state->name); status = nbt_name_dup(state, name, &state->name);
if (!NT_STATUS_IS_OK(status)) goto failed; if (!NT_STATUS_IS_OK(status)) goto failed;
/* use default methods from config file if not passed explicitly */ if (methods == NULL) goto failed;
if (methods == NULL) { state->methods = methods;
state->methods = lp_name_resolve_order();
if (state->methods == NULL) {
return NULL;
}
} else {
state->methods = methods;
}
c->state = SMBCLI_REQUEST_SEND; c->state = SMBCLI_REQUEST_SEND;
c->private = state; 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) 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); return resolve_name_recv(c, mem_ctx, reply_addr);
} }