git.samba.org
/
ira
/
wip.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
param: Add smb.conf loading support to s3/s4 loadparm bridge
[ira/wip.git]
/
source4
/
param
/
loadparm.c
diff --git
a/source4/param/loadparm.c
b/source4/param/loadparm.c
index 3b0eefe603bb629c0780122a0980f3a786554e6b..c1fd5f22a249eb213d1c251b0390ce44355bd29e 100644
(file)
--- a/
source4/param/loadparm.c
+++ b/
source4/param/loadparm.c
@@
-3514,6
+3514,10
@@
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;