diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-08 23:32:37 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:48:56 +0100 |
| commit | dd7e5ed88c48f4ee39e53be07c8839791e914e45 (patch) | |
| tree | fca88a741257b2f5165f3762de6c44053888fc3e /source4/scripting/ejs/smbscript.c | |
| parent | 75ac6cd318ae58aacc77785ba93af50bfe354b63 (diff) | |
| download | samba-dd7e5ed88c48f4ee39e53be07c8839791e914e45.tar.gz samba-dd7e5ed88c48f4ee39e53be07c8839791e914e45.tar.xz samba-dd7e5ed88c48f4ee39e53be07c8839791e914e45.zip | |
r26352: Don't make lp_load create a new context.
(This used to be commit d0d5c1a823a6601292c061dba2b6f4bde2b9e3dd)
Diffstat (limited to 'source4/scripting/ejs/smbscript.c')
| -rw-r--r-- | source4/scripting/ejs/smbscript.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c index e00d52589ad..a4f2e1cd431 100644 --- a/source4/scripting/ejs/smbscript.c +++ b/source4/scripting/ejs/smbscript.c @@ -53,10 +53,12 @@ int main(int argc, const char **argv) fault_setup(argv[0]); + global_loadparm = lp_ctx = loadparm_init(talloc_autofree_context()); + if (getenv("SMB_CONF_PATH")) { - lp_load(talloc_autofree_context(), getenv("SMB_CONF_PATH"), &lp_ctx); + lp_load(lp_ctx, getenv("SMB_CONF_PATH")); } else { - lp_load(talloc_autofree_context(), dyn_CONFIGFILE, &lp_ctx); + lp_load(lp_ctx, dyn_CONFIGFILE); } ldb_global_init(); |