summaryrefslogtreecommitdiff
path: root/source4/scripting
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/scripting
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/scripting')
-rw-r--r--source4/scripting/ejs/smbcalls_nbt.c3
-rw-r--r--source4/scripting/ejs/smbcalls_rpc.c5
2 files changed, 5 insertions, 3 deletions
diff --git a/source4/scripting/ejs/smbcalls_nbt.c b/source4/scripting/ejs/smbcalls_nbt.c
index c5722202f7..f72b4b46ac 100644
--- a/source4/scripting/ejs/smbcalls_nbt.c
+++ b/source4/scripting/ejs/smbcalls_nbt.c
@@ -24,6 +24,7 @@
#include "scripting/ejs/smbcalls.h"
#include "lib/appweb/ejs/ejs.h"
#include "librpc/gen_ndr/ndr_nbt.h"
+#include "lib/events/events.h"
/*
look up a netbios name
@@ -69,7 +70,7 @@ static int ejs_resolve_name(MprVarHandle eid, int argc, struct MprVar **argv)
result = 0;
- nt_status = resolve_name(&name, tmp_ctx, &reply_addr);
+ nt_status = resolve_name(&name, tmp_ctx, &reply_addr, event_context_find(tmp_ctx));
if (NT_STATUS_IS_OK(nt_status)) {
mprSetPropertyValue(argv[0], "value", mprString(reply_addr));
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 6da8cb351c..4163896e71 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -28,6 +28,7 @@
#include "lib/messaging/irpc.h"
#include "scripting/ejs/ejsrpc.h"
#include "dlinklist.h"
+#include "lib/events/events.h"
/*
state of a irpc 'connection'
@@ -69,7 +70,7 @@ static int ejs_irpc_connect(MprVarHandle eid, int argc, char **argv)
p->server_name = argv[0];
- ev = talloc_find_parent_bytype(mprMemCtx(), struct event_context);
+ ev = event_context_find(p);
/* create a messaging context, looping as we have no way to
allocate temporary server ids automatically */
@@ -150,7 +151,7 @@ static int ejs_rpc_connect(MprVarHandle eid, int argc, char **argv)
cli_credentials_set_anonymous(creds);
}
- ev = talloc_find_parent_bytype(mprMemCtx(), struct event_context);
+ ev = event_context_find(mprMemCtx());
status = dcerpc_pipe_connect(this, &p, binding,
iface->uuid, iface->if_version,