From: Ralph Boehme <slow@samba.org>
Date: Mon, 4 Nov 2019 11:33:55 +0000 (+0100)
Subject: smbdotconf: mark "volume" with substitution="1"
X-Git-Tag: ldb-2.1.0~569
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8834eafcacaa01d497f488851fe4f6b339be0e30;p=thirdparty%2Fsamba.git

smbdotconf: mark "volume" 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/volume.xml b/docs-xml/smbdotconf/misc/volume.xml
index 02129f11a54..4f1be6a1b59 100644
--- a/docs-xml/smbdotconf/misc/volume.xml
+++ b/docs-xml/smbdotconf/misc/volume.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="volume"
                  context="S"
                  type="string"
+                 substitution="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This allows you to override the volume label 
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 3d6149fd85b..08fbd1d278a 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -4285,8 +4285,10 @@ int lp_servicenumber(const char *pszServiceName)
 
 const char *volume_label(TALLOC_CTX *ctx, int snum)
 {
+	const struct loadparm_substitution *lp_sub =
+		loadparm_s3_global_substitution();
 	char *ret;
-	const char *label = lp_volume(ctx, snum);
+	const char *label = lp_volume(ctx, lp_sub, snum);
 	size_t end = 32;
 
 	if (!*label) {