diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-02-21 15:13:28 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-05-07 19:49:16 +0200 |
| commit | f6697ef8dab915a6d44b829112a400f757197354 (patch) | |
| tree | ff660676a941f5f035028561631a5adf79c4d394 /lib/param/loadparm.c | |
| parent | 384513873173abab21b87f5c3c457c09ee41c888 (diff) | |
| download | samba-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 'lib/param/loadparm.c')
| -rw-r--r-- | lib/param/loadparm.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index a707753a3e0..f4ee64973cb 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -91,10 +91,6 @@ static bool defaults_saved = false; #define N_(x) x #endif -/* prototypes for the special type handlers */ -static bool handle_include(struct loadparm_context *lp_ctx, int unused, - const char *pszParmValue, char **ptr); - #include "lib/param/param_table.c" /* local variables */ @@ -1105,10 +1101,16 @@ bool handle_realm(struct loadparm_context *lp_ctx, int unused, Handle the include operation. ***************************************************************************/ -static bool handle_include(struct loadparm_context *lp_ctx, int unused, +bool handle_include(struct loadparm_context *lp_ctx, int unused, const char *pszParmValue, char **ptr) { - char *fname = standard_sub_basic(lp_ctx, pszParmValue); + char *fname; + + if (lp_ctx->s3_fns) { + return lp_ctx->s3_fns->lp_include(lp_ctx, unused, pszParmValue, ptr); + } + + fname = standard_sub_basic(lp_ctx, pszParmValue); add_to_file_list(lp_ctx, &lp_ctx->file_lists, pszParmValue, fname); |