diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-03-20 11:00:11 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-07-07 23:32:36 +0200 |
| commit | 76001abf7439f8f46ed82ae8c8795967463d2d83 (patch) | |
| tree | a3139dedf7e47239c6d10bc9627f2112467b5733 /lib/param | |
| parent | e87cb83b472a4906e0bd27a6a6fee3c8387a7567 (diff) | |
| download | samba-76001abf7439f8f46ed82ae8c8795967463d2d83.tar.gz | |
lib/param: rename do_parameter to lpcfg_do_parameter
This should be used to allow it to be called from s3 code.
Change-Id: I2f2d5526cf11a1ad78ca6ff7cb5c18fa25a98c76
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 | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index b452f9c9531..49323c5f1a6 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -70,8 +70,6 @@ #define standard_sub_basic talloc_strdup -static bool do_parameter(const char *, const char *, void *); - #include "lib/param/param_global.h" struct loadparm_service *lpcfg_default_service(struct loadparm_context *lp_ctx) @@ -1121,7 +1119,7 @@ bool handle_include(struct loadparm_context *lp_ctx, int unused, lpcfg_string_set(lp_ctx, ptr, fname); if (file_exist(fname)) - return pm_process(fname, do_section, do_parameter, lp_ctx); + return pm_process(fname, do_section, lpcfg_do_parameter, lp_ctx); DEBUG(2, ("Can't find include file %s\n", fname)); @@ -1695,7 +1693,7 @@ bool lpcfg_do_service_parameter(struct loadparm_context *lp_ctx, * Process a parameter. */ -static bool do_parameter(const char *pszParmName, const char *pszParmValue, +bool lpcfg_do_parameter(const char *pszParmName, const char *pszParmValue, void *userdata) { struct loadparm_context *lp_ctx = (struct loadparm_context *)userdata; @@ -2792,7 +2790,7 @@ bool lpcfg_load(struct loadparm_context *lp_ctx, const char *filename) /* We get sections first, so have to start 'behind' to make up */ lp_ctx->currentService = NULL; - bRetval = pm_process(n2, do_section, do_parameter, lp_ctx); + bRetval = pm_process(n2, do_section, lpcfg_do_parameter, lp_ctx); /* finish up the last section */ DEBUG(4, ("pm_process() returned %s\n", BOOLSTR(bRetval))); |