From f6697ef8dab915a6d44b829112a400f757197354 Mon Sep 17 00:00:00 2001 From: Garming Sam Date: Fri, 21 Feb 2014 15:13:28 +1300 Subject: param: use a single handle_include function between the two loadparms Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett Reviewed-by: Jeremy Allison --- source3/param/loadparm.c | 3 +-- source3/param/loadparm_ctx.c | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/param') diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 3f16b57b696..554106e25b7 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -261,7 +261,6 @@ static struct file_lists *file_lists = NULL; #define NUMPARAMETERS (sizeof(parm_table) / sizeof(struct parm_struct)) /* prototypes for the special type handlers */ -static bool handle_include(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr); static bool handle_idmap_backend(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr); static bool handle_idmap_uid(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr); static bool handle_idmap_gid(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr); @@ -2470,7 +2469,7 @@ static bool handle_netbios_aliases(struct loadparm_context *unused, int snum, co ***************************************************************************/ static bool bAllowIncludeRegistry = true; -static bool handle_include(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr) +bool lp_include(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr) { char *fname; diff --git a/source3/param/loadparm_ctx.c b/source3/param/loadparm_ctx.c index d13304ff210..b6e185e653a 100644 --- a/source3/param/loadparm_ctx.c +++ b/source3/param/loadparm_ctx.c @@ -71,6 +71,7 @@ static struct loadparm_s3_helpers s3_fns = .dump = lp_dump, .lp_string = lp_string, .lp_string_set = lp_string_set, + .lp_include = lp_include, }; const struct loadparm_s3_helpers *loadparm_s3_helpers(void) -- cgit