diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-02-28 11:09:24 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-07-07 23:32:36 +0200 |
| commit | 2d9b3020fad58f09c13b240bdfc6790ced77961a (patch) | |
| tree | f78c54dd6164dc82625c8454db18ba8e8670b5dd /source3/param | |
| parent | a4f2f3a509ca7ce531c29e2761a3be2e43408b3f (diff) | |
| download | samba-2d9b3020fad58f09c13b240bdfc6790ced77961a.tar.gz samba-2d9b3020fad58f09c13b240bdfc6790ced77961a.tar.xz samba-2d9b3020fad58f09c13b240bdfc6790ced77961a.zip | |
param: attempt to start factoring out the bInGlobalSection parameter
Eventually this parameter should be solely on the loadparm context. It
should really only have meaning during the globals init.
Change-Id: If0fd2037ce4e8399fbf00f63bc138d9c146d7570
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Nadezhda Ivanova <nivanova@samba.org>
Diffstat (limited to 'source3/param')
| -rw-r--r-- | source3/param/loadparm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index a0afa5d49a..40852968b9 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -2361,7 +2361,7 @@ static void init_iconv(void) ***************************************************************************/ static bool bAllowIncludeRegistry = true; -bool lp_include(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr) +bool lp_include(struct loadparm_context *lp_ctx, int snum, const char *pszParmValue, char **ptr) { char *fname; @@ -2375,7 +2375,7 @@ bool lp_include(struct loadparm_context *unused, int snum, const char *pszParmVa if (!bAllowIncludeRegistry) { return true; } - if (bInGlobalSection) { + if (lp_ctx->bInGlobalSection) { bool ret; include_depth++; ret = process_registry_globals(); @@ -2646,6 +2646,7 @@ bool lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue loadparm_s3_helpers()); lp_ctx->sDefault = &sDefault; lp_ctx->services = ServicePtrs; + lp_ctx->bInGlobalSection = bInGlobalSection; ok = parm_table[parmnum].special(lp_ctx, snum, pszParmValue, (char **)parm_ptr); TALLOC_FREE(frame); |