summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-08-12 22:17:26 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-08-13 20:18:41 +1000
commitb51f97325b8ea330e20ee7c4bf673c4475dd0a0e (patch)
tree4fadc5d0dc540aa3f787fd2c752fb15b33f496d1
parent305cb567f4f14ef329efc4756a17483076d9270c (diff)
downloadsamba-b51f97325b8ea330e20ee7c4bf673c4475dd0a0e.tar.gz
samba-b51f97325b8ea330e20ee7c4bf673c4475dd0a0e.tar.bz2
samba-b51f97325b8ea330e20ee7c4bf673c4475dd0a0e.zip
s4-param Set szConfigFile even for s3 loadparm contexts
-rw-r--r--source4/param/loadparm.c8
1 files changed, 4 insertions, 4 deletions
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));