From: Ralph Boehme <slow@samba.org>
Date: Tue, 5 Nov 2019 10:51:56 +0000 (+0100)
Subject: smbdotconf: mark "root directory" with substitution="1"
X-Git-Tag: ldb-2.1.0~529
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8077804c36c44631ba09d52308fe9ad213ae7eb5;p=thirdparty%2Fsamba.git

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

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

diff --git a/docs-xml/smbdotconf/security/rootdirectory.xml b/docs-xml/smbdotconf/security/rootdirectory.xml
index e795af26bf8..008ec5086fc 100644
--- a/docs-xml/smbdotconf/security/rootdirectory.xml
+++ b/docs-xml/smbdotconf/security/rootdirectory.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="root directory"
                  context="G"
                  type="string"
+                 substitution="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>root</synonym>
 <synonym>root dir</synonym>
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 0e0d45d2af1..c2952ddfc93 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -3899,6 +3899,8 @@ void smbd_process(struct tevent_context *ev_ctx,
 		.ev = ev_ctx,
 		.frame = talloc_stackframe(),
 	};
+	const struct loadparm_substitution *lp_sub =
+		loadparm_s3_global_substitution();
 	struct smbXsrv_client *client = NULL;
 	struct smbd_server_connection *sconn = NULL;
 	struct smbXsrv_connection *xconn = NULL;
@@ -4029,7 +4031,7 @@ void smbd_process(struct tevent_context *ev_ctx,
 		exit_server("Could not open account policy tdb.\n");
 	}
 
-	chroot_dir = lp_root_directory(talloc_tos());
+	chroot_dir = lp_root_directory(talloc_tos(), lp_sub);
 	if (chroot_dir[0] != '\0') {
 		rc = chdir(chroot_dir);
 		if (rc != 0) {