]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
smbdotconf: mark "magic script" with substitution="1"
authorRalph Boehme <slow@samba.org>
Thu, 31 Oct 2019 17:49:07 +0000 (18:49 +0100)
committerStefan Metzmacher <metze@samba.org>
Wed, 27 Nov 2019 10:25:33 +0000 (10:25 +0000)
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
docs-xml/smbdotconf/misc/magicscript.xml
source3/smbd/close.c

index cbc4209f0c8dc2ddbb2c67442e89437fe6135f18..614f5ae8fad3d9be2b3cb51ecb22fc7c91afb687 100644 (file)
@@ -1,6 +1,7 @@
 <samba:parameter name="magic script"
                  context="S"
                  type="string"
+                 substitution="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
        <para>This parameter specifies the name of a file which, 
index 2623ca533a0c6ca460bcc1e82215a14ffbdcafe7..18defc1ac5c87ff8be1517ae4e8472af1cac58be 100644 (file)
@@ -50,7 +50,7 @@ static NTSTATUS check_magic(struct files_struct *fsp)
        char *fname = NULL;
        NTSTATUS status;
 
-       if (!*lp_magic_script(talloc_tos(), SNUM(conn))) {
+       if (!*lp_magic_script(talloc_tos(), lp_sub, SNUM(conn))) {
                return NT_STATUS_OK;
        }
 
@@ -66,7 +66,7 @@ static NTSTATUS check_magic(struct files_struct *fsp)
                p++;
        }
 
-       if (!strequal(lp_magic_script(talloc_tos(), SNUM(conn)),p)) {
+       if (!strequal(lp_magic_script(talloc_tos(), lp_sub, SNUM(conn)),p)) {
                status = NT_STATUS_OK;
                goto out;
        }