From 595685c1655fb71e64ba94bca504349cb25561b2 Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Thu, 31 Oct 2019 18:47:43 +0100 Subject: [PATCH] smbdotconf: mark "magic output" with substitution="1" Signed-off-by: Ralph Boehme Reviewed-by: Stefan Metzmacher --- docs-xml/smbdotconf/misc/magicoutput.xml | 1 + source3/smbd/close.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docs-xml/smbdotconf/misc/magicoutput.xml b/docs-xml/smbdotconf/misc/magicoutput.xml index 784d09016ac..17b3c6737c3 100644 --- a/docs-xml/smbdotconf/misc/magicoutput.xml +++ b/docs-xml/smbdotconf/misc/magicoutput.xml @@ -1,6 +1,7 @@ diff --git a/source3/smbd/close.c b/source3/smbd/close.c index 180a5da735b..2623ca533a0 100644 --- a/source3/smbd/close.c +++ b/source3/smbd/close.c @@ -39,6 +39,8 @@ static NTSTATUS check_magic(struct files_struct *fsp) { int ret; + const struct loadparm_substitution *lp_sub = + loadparm_s3_global_substitution(); const char *magic_output = NULL; SMB_STRUCT_STAT st; int tmp_fd, outfd; @@ -69,8 +71,8 @@ static NTSTATUS check_magic(struct files_struct *fsp) goto out; } - if (*lp_magic_output(talloc_tos(), SNUM(conn))) { - magic_output = lp_magic_output(talloc_tos(), SNUM(conn)); + if (*lp_magic_output(talloc_tos(), lp_sub, SNUM(conn))) { + magic_output = lp_magic_output(talloc_tos(), lp_sub, SNUM(conn)); } else { magic_output = talloc_asprintf(ctx, "%s.out", -- 2.34.1