git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
305cb56
)
s4-param Set szConfigFile even for s3 loadparm contexts
author
Andrew Bartlett
<abartlet@samba.org>
Fri, 12 Aug 2011 12:17:26 +0000
(22:17 +1000)
committer
Andrew Bartlett
<abartlet@samba.org>
Sat, 13 Aug 2011 10:18:41 +0000
(20:18 +1000)
source4/param/loadparm.c
patch
|
blob
|
history
diff --git
a/source4/param/loadparm.c
b/source4/param/loadparm.c
index c1fd5f22a249eb213d1c251b0390ce44355bd29e..ba9668a1c645488e83add8c19fc668c8e4ba237b 100644
(file)
--- 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));