From d72b05cfe7d5c020fa32c8906f6185e1427e0a88 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 6 Jun 2011 11:16:19 +1000 Subject: [PATCH] s3-passdb use new loadparm_init_s3 rather than reloading the smb.conf --- source3/passdb/pdb_samba4.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/source3/passdb/pdb_samba4.c b/source3/passdb/pdb_samba4.c index 558f8d034ca..b8b11e4551f 100644 --- a/source3/passdb/pdb_samba4.c +++ b/source3/passdb/pdb_samba4.c @@ -2061,21 +2061,9 @@ static NTSTATUS pdb_init_samba4(struct pdb_methods **pdb_method, goto fail; } - state->lp_ctx = loadparm_init(state); + state->lp_ctx = loadparm_init_s3(state, loadparm_s3_context()); if (state->lp_ctx == NULL) { - DEBUG(10, ("loadparm_init 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)); + DEBUG(10, ("loadparm_init_s3 failed\n")); goto fail; }