mirror of
https://github.com/samba-team/samba.git
synced 2025-11-16 20:23:50 +03:00
r26339: Make loadparm talloc-allocated.
This commit is contained in:
committed by
Stefan Metzmacher
parent
2a005096dd
commit
1e02cd8db1
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user