From: Ralph Boehme <slow@samba.org>
Date: Mon, 4 Nov 2019 11:20:21 +0000 (+0100)
Subject: smbdotconf: mark "root preexec" with substitution="1"
X-Git-Tag: ldb-2.1.0~572
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17726dab60fef0c28ecaf4edb03e320d74b74470;p=thirdparty%2Fsamba.git

smbdotconf: mark "root preexec" with substitution="1"

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/docs-xml/smbdotconf/misc/rootpreexec.xml b/docs-xml/smbdotconf/misc/rootpreexec.xml
index 32bfe442bde..32c4ef7b6fe 100644
--- a/docs-xml/smbdotconf/misc/rootpreexec.xml
+++ b/docs-xml/smbdotconf/misc/rootpreexec.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="root preexec"
                  context="S"
                  type="string"
+                 substitution="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 07732a23297..f82bc0d5d13 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -732,7 +732,7 @@ static NTSTATUS make_connection_snum(struct smbXsrv_connection *xconn,
 	/* Preexecs are done here as they might make the dir we are to ChDir
 	 * to below */
 	/* execute any "root preexec = " line */
-	if (*lp_root_preexec(talloc_tos(), snum)) {
+	if (*lp_root_preexec(talloc_tos(), lp_sub, snum)) {
 		char *cmd = talloc_sub_full(talloc_tos(),
 					lp_const_servicename(SNUM(conn)),
 					conn->session_info->unix_info->unix_name,
@@ -740,7 +740,7 @@ static NTSTATUS make_connection_snum(struct smbXsrv_connection *xconn,
 					conn->session_info->unix_token->gid,
 					conn->session_info->unix_info->sanitized_username,
 					conn->session_info->info->domain_name,
-					lp_root_preexec(talloc_tos(), snum));
+					lp_root_preexec(talloc_tos(), lp_sub, snum));
 		DEBUG(5,("cmd=%s\n",cmd));
 		ret = smbrun(cmd, NULL, NULL);
 		TALLOC_FREE(cmd);