sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-10 13:57:47 +03:00
Code

lib/param: rename do_parameter to lpcfg_do_parameter

Browse Source 
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>
This commit is contained in:
Garming Sam 2014-03-20 11:00:11 +13:00 committed by Andrew Bartlett
parent e87cb83b47
commit 76001abf74
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/param/loadparm.c
View File

@ -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)));