sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s3-passdb use new loadparm_init_s3 rather than reloading the smb.conf

Browse Source
This commit is contained in:
Andrew Bartlett 2011-06-06 11:16:19 +10:00
parent 907cdb5de7
commit d72b05cfe7
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source3/passdb/pdb_samba4.c
View File

@ -2061,21 +2061,9 @@ static NTSTATUS pdb_init_samba4(struct pdb_methods **pdb_method,
goto fail; goto fail;
} }
state->lp_ctx = loadparm_init(state); state->lp_ctx = loadparm_init_s3(state, loadparm_s3_context());
if (state->lp_ctx == NULL) { if (state->lp_ctx == NULL) {
DEBUG(10, ("loadparm_init failed\n")); DEBUG(10, ("loadparm_init_s3 failed\n"));
goto fail;
}
if (lp_loaded()) {
config_file = lp_configfile();
}
if (!config_file || !config_file[0]) {
config_file = get_dyn_CONFIGFILE();
}
if (!lpcfg_load(state->lp_ctx, config_file)) {
DEBUG(1, ("s4 lpcfg_load() of s3 config file %s failed", config_file));
goto fail; goto fail;
} }