summaryrefslogtreecommitdiffstats
path: root/source3/param
diff options
context:
space:
mode:
authorGarming Sam <garming@catalyst.net.nz>2014-02-21 15:13:28 +1300
committerJeremy Allison <jra@samba.org>2014-05-07 19:49:16 +0200
commitf6697ef8dab915a6d44b829112a400f757197354 (patch)
treeff660676a941f5f035028561631a5adf79c4d394 /source3/param
parent384513873173abab21b87f5c3c457c09ee41c888 (diff)
downloadsamba-f6697ef8dab915a6d44b829112a400f757197354.tar.gz
samba-f6697ef8dab915a6d44b829112a400f757197354.tar.xz
samba-f6697ef8dab915a6d44b829112a400f757197354.zip
param: use a single handle_include function between the two loadparms
Signed-off-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/param')
-rw-r--r--source3/param/loadparm.c3
-rw-r--r--source3/param/loadparm_ctx.c1
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 3f16b57b69..554106e25b 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 d13304ff21..b6e185e653 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)