From b51f97325b8ea330e20ee7c4bf673c4475dd0a0e Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 12 Aug 2011 22:17:26 +1000 Subject: s4-param Set szConfigFile even for s3 loadparm contexts --- source4/param/loadparm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source4/param') diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index c1fd5f22a2..ba9668a1c6 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -3514,14 +3514,14 @@ bool lpcfg_load(struct loadparm_context *lp_ctx, const char *filename) char *n2; bool bRetval; - if (lp_ctx->s3_fns) { - return lp_ctx->s3_fns->load(filename); - } - filename = talloc_strdup(lp_ctx, filename); lp_ctx->szConfigFile = filename; + if (lp_ctx->s3_fns) { + return lp_ctx->s3_fns->load(filename); + } + lp_ctx->bInGlobalSection = true; n2 = standard_sub_basic(lp_ctx, lp_ctx->szConfigFile); DEBUG(2, ("lpcfg_load: refreshing parameters from %s\n", n2)); -- cgit