diff options
Diffstat (limited to 'lib/param')
-rw-r--r-- | lib/param/loadparm.c | 14 | ||||
-rw-r--r-- | lib/param/loadparm.h | 1 | ||||
-rw-r--r-- | lib/param/s3_param.h | 1 |
3 files changed, 10 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); diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h index c9baed5c7c5..70443a97ead 100644 --- a/lib/param/loadparm.h +++ b/lib/param/loadparm.h @@ -263,6 +263,7 @@ struct loadparm_global * get_globals(void); char * lp_string(TALLOC_CTX *, const char *); bool lp_string_set(char **, const char *); int getservicebyname(const char *, struct loadparm_service *); +bool lp_include(struct loadparm_context *, int, const char *, char **); /** * Check if two parameters are equal. diff --git a/lib/param/s3_param.h b/lib/param/s3_param.h index 4ec922f07b6..27ad192f749 100644 --- a/lib/param/s3_param.h +++ b/lib/param/s3_param.h @@ -16,6 +16,7 @@ struct loadparm_s3_helpers void (*dump)(FILE *f, bool show_defaults, int maxtoprint); char * (*lp_string)(TALLOC_CTX *ctx, const char *in); bool (*lp_string_set)(char **dest, const char *src); + bool (*lp_include)(struct loadparm_context*, int, const char *, char **); struct loadparm_global *globals; }; |