From: Ralph Boehme <slow@samba.org>
Date: Tue, 5 Nov 2019 11:01:45 +0000 (+0100)
Subject: smbdotconf: mark "set quota command" with substitution="1"
X-Git-Tag: ldb-2.1.0~526
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd72181fd0d9275b8b2972cf0393fd0cc4b94088;p=thirdparty%2Fsamba.git

smbdotconf: mark "set quota command" with substitution="1"

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

diff --git a/docs-xml/smbdotconf/vfs/setquotacommand.xml b/docs-xml/smbdotconf/vfs/setquotacommand.xml
index 2a779d4a50f..6ae6ef11409 100644
--- a/docs-xml/smbdotconf/vfs/setquotacommand.xml
+++ b/docs-xml/smbdotconf/vfs/setquotacommand.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="set quota command"
                  context="G"
-				 type="string"
+                 type="string"
+                 substitution="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>The <command>set quota command</command> should only be used 
diff --git a/source3/lib/sysquotas.c b/source3/lib/sysquotas.c
index 3e91752b6b6..64e41f740a3 100644
--- a/source3/lib/sysquotas.c
+++ b/source3/lib/sysquotas.c
@@ -425,9 +425,11 @@ invalid_param:
 
 static int command_set_quota(const char *path, enum SMB_QUOTA_TYPE qtype, unid_t id, SMB_DISK_QUOTA *dp)
 {
+	const struct loadparm_substitution *lp_sub =
+		loadparm_s3_global_substitution();
 	const char *set_quota_command;
 
-	set_quota_command = lp_set_quota_command(talloc_tos());
+	set_quota_command = lp_set_quota_command(talloc_tos(), lp_sub);
 	if (set_quota_command && *set_quota_command) {
 		char **lines = NULL;
 		int _id = -1;