diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-09-27 23:31:28 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:07:24 -0500 |
| commit | 3048e9ad654506219b169a934edded388d10fcad (patch) | |
| tree | c1844fe26108014e59c2be927266783b67124e6e /source4/scripting/ejs | |
| parent | 3ff257b36b9a7adb986f39f66b2c8181b61a29ee (diff) | |
| download | samba-3048e9ad654506219b169a934edded388d10fcad.tar.gz samba-3048e9ad654506219b169a934edded388d10fcad.tar.bz2 samba-3048e9ad654506219b169a934edded388d10fcad.zip | |
r25392: Add loadparm context as argument in a couple more places.
(This used to be commit c62f51cc28a37959128e78a1f34cfd4c6d3ba069)
Diffstat (limited to 'source4/scripting/ejs')
| -rw-r--r-- | source4/scripting/ejs/smbcalls_config.c | 2 | ||||
| -rw-r--r-- | source4/scripting/ejs/smbscript.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c index 8f1339db34..f488b0745f 100644 --- a/source4/scripting/ejs/smbcalls_config.c +++ b/source4/scripting/ejs/smbcalls_config.c @@ -200,7 +200,7 @@ static int ejs_lpSet(MprVarHandle eid, int argc, char **argv) return -1; } - mpr_Return(eid, mprCreateBoolVar(lp_set_cmdline(argv[0], argv[1]))); + mpr_Return(eid, mprCreateBoolVar(lp_set_cmdline(global_loadparm, argv[0], argv[1]))); return 0; } diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c index a21669a07e..9f7e048fc0 100644 --- a/source4/scripting/ejs/smbscript.c +++ b/source4/scripting/ejs/smbscript.c @@ -52,7 +52,7 @@ int main(int argc, const char **argv) fault_setup(argv[0]); if (getenv("SMB_CONF_PATH")) { - lp_set_cmdline("config file", getenv("SMB_CONF_PATH")); + lp_set_cmdline(global_loadparm, "config file", getenv("SMB_CONF_PATH")); } ldb_global_init(); |