summaryrefslogtreecommitdiff
path: root/source4/libcli
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-08-28 02:37:14 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:34:51 -0500
commitc98c6aa5611f26ab591c50fcded1fc55e81a0d07 (patch)
tree599e3e9efc13a33535b50d40d9035c57a853dc19 /source4/libcli
parente669d0c53d843e664fc5b3d8f3ebcb170ceb8f37 (diff)
downloadsamba-c98c6aa5611f26ab591c50fcded1fc55e81a0d07.tar.gz
samba-c98c6aa5611f26ab591c50fcded1fc55e81a0d07.tar.bz2
samba-c98c6aa5611f26ab591c50fcded1fc55e81a0d07.zip
r9702: r9680@blu: tridge | 2005-08-27 18:45:08 +1000
- fixed ncacn_ip_tcp to use the generic async name resolution methods, so NBT names now work (as requested several times by abartlet!) - changed resolve_name() to take an event_context, so it doesn't cause the whole process to block - cleaned up the talloc_find_parent_bytype() calls to go via a cleaner event_context_find() call (This used to be commit b3d491b210a8b889a25efcb273e70fefbd01b7f7)
Diffstat (limited to 'source4/libcli')
-rw-r--r--source4/libcli/raw/clisocket.c2
-rw-r--r--source4/libcli/resolve/resolve.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/source4/libcli/raw/clisocket.c b/source4/libcli/raw/clisocket.c
index b325fa473e..90fb98603e 100644
--- a/source4/libcli/raw/clisocket.c
+++ b/source4/libcli/raw/clisocket.c
@@ -326,7 +326,7 @@ BOOL smbcli_sock_connect_byname(struct smbcli_socket *sock, const char *host, in
nbt_name.type = name_type;
nbt_name.scope = NULL;
- status = resolve_name(&nbt_name, sock, &address);
+ status = resolve_name(&nbt_name, sock, &address, sock->event.ctx);
if (!NT_STATUS_IS_OK(status)) {
return False;
}
diff --git a/source4/libcli/resolve/resolve.c b/source4/libcli/resolve/resolve.c
index 3607400155..733eddf643 100644
--- a/source4/libcli/resolve/resolve.c
+++ b/source4/libcli/resolve/resolve.c
@@ -176,9 +176,10 @@ 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)
+NTSTATUS resolve_name(struct nbt_name *name, TALLOC_CTX *mem_ctx, const char **reply_addr,
+ struct event_context *ev)
{
- struct composite_context *c = resolve_name_send(name, NULL, lp_name_resolve_order());
+ struct composite_context *c = resolve_name_send(name, ev, lp_name_resolve_order());
return resolve_name_recv(c, mem_ctx, reply_addr);
}