sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-05 12:22:11 +03:00
Code Activity

r26275: return loadparm context in lp_load.

Browse Source 
(This used to be commit d01f0f4c20)
This commit is contained in:
Jelmer Vernooij
2007-12-04 00:12:13 +01:00
committed by Stefan Metzmacher
parent fc2f06d31b
commit b038240ac7
11 changed files with 51 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source4/scripting/ejs/smbcalls_config.c
View File

@ -187,7 +187,9 @@ static int ejs_lpSet(MprVarHandle eid, int argc, char **argv)
*/
static int ejs_lpReload(MprVarHandle eid, int argc, char **argv)
{
bool ret = lp_load(lp_configfile(global_loadparm));
bool ret;
ret = lp_load(lp_configfile(global_loadparm), NULL);
if (ret) {
unload_interfaces();
}

7
source4/scripting/ejs/smbscript.c
View File

@ -49,18 +49,19 @@ int main(int argc, const char **argv)
const char *fname;
struct MprVar *return_var;
int exit_status, i;
struct loadparm_context *lp_ctx;
fault_setup(argv[0]);
if (getenv("SMB_CONF_PATH")) {
lp_load(getenv("SMB_CONF_PATH"));
lp_load(getenv("SMB_CONF_PATH"), &lp_ctx);
} else {
lp_load(dyn_CONFIGFILE);
lp_load(dyn_CONFIGFILE, &lp_ctx);
}
ldb_global_init();
gensec_init(global_loadparm);
gensec_init(lp_ctx);
mprSetCtx(mem_ctx);