diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-02-28 11:58:55 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-07-07 23:32:36 +0200 |
| commit | 8947af1bd20638114a32631986325e013bfa0104 (patch) | |
| tree | 49596931efbcce0a34177694f04da8a64fc447ea /lib/param | |
| parent | 21d5c667d8538933e4b106394c4e06231813a2e8 (diff) | |
| download | samba-8947af1bd20638114a32631986325e013bfa0104.tar.gz samba-8947af1bd20638114a32631986325e013bfa0104.tar.xz samba-8947af1bd20638114a32631986325e013bfa0104.zip | |
param: Use set_variable instead of set_variable_helper in lp_do_parameter
This extends the usage of the temporary s3 context in lp_do_parameter
to beyond the special functions.
At least for now, this will be necessary for sorting out the
differences between the do_parameter code.
Change-Id: Iac380d11a927e466ab1a56d34cebe343c3608707
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 'lib/param')
| -rw-r--r-- | lib/param/loadparm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 12e402d080..5e89b7ecbc 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -1406,7 +1406,7 @@ static bool lp_do_parameter_parametric(struct loadparm_context *lp_ctx, return true; } -bool set_variable_helper(TALLOC_CTX *mem_ctx, int parmnum, void *parm_ptr, +static bool set_variable_helper(TALLOC_CTX *mem_ctx, int parmnum, void *parm_ptr, const char *pszParmName, const char *pszParmValue) { int i; @@ -1533,7 +1533,7 @@ bool set_variable_helper(TALLOC_CTX *mem_ctx, int parmnum, void *parm_ptr, } -static bool set_variable(TALLOC_CTX *mem_ctx, int parmnum, void *parm_ptr, +bool set_variable(TALLOC_CTX *mem_ctx, int snum, int parmnum, void *parm_ptr, const char *pszParmName, const char *pszParmValue, struct loadparm_context *lp_ctx, bool on_globals) { @@ -1542,7 +1542,7 @@ static bool set_variable(TALLOC_CTX *mem_ctx, int parmnum, void *parm_ptr, /* if it is a special case then go ahead */ if (parm_table[parmnum].special) { - ok = parm_table[parmnum].special(lp_ctx, -1, pszParmValue, + ok = parm_table[parmnum].special(lp_ctx, snum, pszParmValue, (char **)parm_ptr); if (!ok) { return false; @@ -1598,7 +1598,7 @@ bool lpcfg_do_global_parameter(struct loadparm_context *lp_ctx, parm_ptr = lpcfg_parm_ptr(lp_ctx, NULL, &parm_table[parmnum]); - return set_variable(lp_ctx->globals->ctx, parmnum, parm_ptr, + return set_variable(lp_ctx->globals->ctx, -1, parmnum, parm_ptr, pszParmName, pszParmValue, lp_ctx, true); } @@ -1647,7 +1647,7 @@ bool lpcfg_do_service_parameter(struct loadparm_context *lp_ctx, parm_table[i].p_class == parm_table[parmnum].p_class) bitmap_clear(service->copymap, i); - return set_variable(service, parmnum, parm_ptr, pszParmName, + return set_variable(service, -1, parmnum, parm_ptr, pszParmName, pszParmValue, lp_ctx, false); } |