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 02129f11a54332224bb316d053d0d8dc03f5f866..4f1be6a1b599a3dcd137a2fd2b0b7adbbfa5fc25 100644 (file)
--- 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 3d6149fd85b11dd61c9ba5e472d1e39942545573..08fbd1d278a36585bc2ccb05c57b7ee76728fada 100644 (file)
--- 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) {