From c511eb0af59ea5066507fcb8e3d63bb8798c3654 Mon Sep 17 00:00:00 2001 From: Quentin Gibeaux Date: Wed, 9 Sep 2015 12:07:20 +0200 Subject: [PATCH 1/2] lib/param: handle (ignore) substitution variable in smb.conf Signed-off-by: Quentin Gibeaux --- 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)); From c98f1b333869e7501c85e3d6ee835c3032fcc0d4 Mon Sep 17 00:00:00 2001 From: Quentin Gibeaux Date: Wed, 9 Sep 2015 12:07:20 +0200 Subject: [PATCH 2/2] lib/param: handle (ignore) substitution variable in smb.conf BUG: https://bugzilla.samba.org/show_bug.cgi?id=10722 The function handle_include returns false when trying to include files that have a substitution variable in filename (like %U), this patch makes handle_include to ignore this case, to make samba-tool work when there is such include in samba's configuration. Error was : Can't find include file %U.conf ERROR(runtime): uncaught exception - Unable to load default file Signed-off-by: Quentin Gibeaux --- lib/param/loadparm.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index a0700a9..b54d000 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -1090,6 +1090,8 @@ bool handle_include(struct loadparm_context *lp_ctx, struct loadparm_service *se const char *pszParmValue, char **ptr) { char *fname; + char *substitution_variable_substring; + char next_char; if (lp_ctx->s3_fns) { return lp_ctx->s3_fns->lp_include(lp_ctx, service, pszParmValue, ptr); @@ -1104,6 +1106,20 @@ bool handle_include(struct loadparm_context *lp_ctx, struct loadparm_service *se if (file_exist(fname)) return pm_process(fname, do_section, lpcfg_do_parameter, lp_ctx); + /* If the file doesn't exist, we check that it isn't due to variable + substitution */ + substitution_variable_substring = strchr(fname, '%'); + + if (substitution_variable_substring != NULL) { + 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 substitution in " + "filename, ignoring file.\n", fname)); + return true; + } + } + DEBUG(2, ("Can't find include file %s\n", fname)); return false;