summaryrefslogtreecommitdiff
path: root/source4/scripting/ejs
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-08 23:31:41 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:48:49 +0100
commita48fdda5fec99649e29760c7a9c91246438c9579 (patch)
treec4e3014514c4f91ff356ca6e7069d288d0554ee1 /source4/scripting/ejs
parent47554fd72e00911f05c1c16f1af4d06481d32882 (diff)
downloadsamba-a48fdda5fec99649e29760c7a9c91246438c9579.tar.gz
samba-a48fdda5fec99649e29760c7a9c91246438c9579.tar.bz2
samba-a48fdda5fec99649e29760c7a9c91246438c9579.zip
r26339: Make loadparm talloc-allocated.
(This used to be commit 1e02cd8db1d65ff72b747833904a10b47749b1fb)
Diffstat (limited to 'source4/scripting/ejs')
-rw-r--r--source4/scripting/ejs/smbcalls_config.c2
-rw-r--r--source4/scripting/ejs/smbscript.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index 347cb758fe..157587186c 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -189,7 +189,7 @@ static int ejs_lpReload(MprVarHandle eid, int argc, char **argv)
{
bool ret;
- ret = lp_load(lp_configfile(global_loadparm), NULL);
+ ret = lp_load(talloc_autofree_context(), lp_configfile(global_loadparm), NULL);
if (ret) {
unload_interfaces();
}
diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 2bb67135ea..e00d52589a 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -54,9 +54,9 @@ int main(int argc, const char **argv)
fault_setup(argv[0]);
if (getenv("SMB_CONF_PATH")) {
- lp_load(getenv("SMB_CONF_PATH"), &lp_ctx);
+ lp_load(talloc_autofree_context(), getenv("SMB_CONF_PATH"), &lp_ctx);
} else {
- lp_load(dyn_CONFIGFILE, &lp_ctx);
+ lp_load(talloc_autofree_context(), dyn_CONFIGFILE, &lp_ctx);
}
ldb_global_init();