From 3f4ac4603a0bb310b43d9a3e9a6462c35c04f6ec Mon Sep 17 00:00:00 2001 From: Quentin Gibeaux Date: Wed, 9 Sep 2015 12:07:20 +0200 Subject: [PATCH] lib/param: handle (ignore) substitution variable in smb.conf --- lib/param/loadparm.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index a0700a9..72e53f7 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -1101,8 +1101,22 @@ bool handle_include(struct loadparm_context *lp_ctx, struct loadparm_service *se lpcfg_string_set(lp_ctx, ptr, fname); - if (file_exist(fname)) + if (file_exist(fname)) { return pm_process(fname, do_section, lpcfg_do_parameter, lp_ctx); + } else { + char *substitution_variable_substring; + substitution_variable_substring = strchr(fname, '%'); + + if (substitution_variable_substring) { + char next_char = substitution_variable_substring[1]; + if ((next_char >= 'a' && next_char <= 'z') + || (next_char >= 'A' && next_char <= 'Z')) { + DEBUG(2, ("Tried to load %s but variable in " + "filename, ignoring file.\n", fname)); + return true; + } + } + } DEBUG(2, ("Can't find include file %s\n", fname)); -- 1.7.9.5