summaryrefslogtreecommitdiff
path: root/source4/scripting/ejs/smbcalls.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-21 18:21:44 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-21 18:21:44 +0100
commite11c61bc5cd487dce06fc38bb0ee8c4e24b04e8c (patch)
tree5e7dd6c56c9886c4f8530faf92293d4a22684215 /source4/scripting/ejs/smbcalls.c
parent3c20b3eebafe46127a7b69cca573c6a128f8de89 (diff)
downloadsamba-e11c61bc5cd487dce06fc38bb0ee8c4e24b04e8c.tar.gz
samba-e11c61bc5cd487dce06fc38bb0ee8c4e24b04e8c.tar.bz2
samba-e11c61bc5cd487dce06fc38bb0ee8c4e24b04e8c.zip
Introduce mprLpCtx() similar to mprMemCtx() for loadparm_context used by
all EJS code. (This used to be commit 184988866fe8e740f58e3683eefcaa70f8b51d11)
Diffstat (limited to 'source4/scripting/ejs/smbcalls.c')
-rw-r--r--source4/scripting/ejs/smbcalls.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 1f29fce002..63a80e17db 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -111,7 +111,7 @@ static int ejs_typeof_native(MprVarHandle eid, int argc, struct MprVar **argv)
static int ejs_libinclude(int eid, int argc, char **argv)
{
int i, j;
- const char **js_include = lp_js_include(global_loadparm);
+ const char **js_include = lp_js_include(mprLpCtx());
if (js_include == NULL || js_include[0] == NULL) {
ejsSetErrorMsg(eid, "js include path not set");
@@ -184,7 +184,7 @@ void smb_setup_ejs_functions(void (*exception_handler)(const char *))
smb_setup_ejs_param();
smb_setup_ejs_literal();
- shared_init = load_samba_modules(NULL, global_loadparm, "smbcalls");
+ shared_init = load_samba_modules(NULL, mprLpCtx(), "smbcalls");
run_init_functions(static_init);
run_init_functions(shared_init);