From: Ralph Boehme <slow@samba.org>
Date: Tue, 5 Nov 2019 10:24:16 +0000 (+0100)
Subject: smbdotconf: mark "perfcount module" with substitution="1"
X-Git-Tag: ldb-2.1.0~533
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c5dbcc397f96bb9960786a3f91b7d2f4012aeff;p=thirdparty%2Fsamba.git

smbdotconf: mark "perfcount module" 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/perfcountmodule.xml b/docs-xml/smbdotconf/misc/perfcountmodule.xml
index e1c09488624..e25105fdb42 100644
--- a/docs-xml/smbdotconf/misc/perfcountmodule.xml
+++ b/docs-xml/smbdotconf/misc/perfcountmodule.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="perfcount module"
                  context="G"
                  type="string"
+                 substitution="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter specifies the perfcount backend to be used when monitoring SMB
diff --git a/source3/smbd/perfcount.c b/source3/smbd/perfcount.c
index 1555ea24b64..c46cd3ebe83 100644
--- a/source3/smbd/perfcount.c
+++ b/source3/smbd/perfcount.c
@@ -174,9 +174,11 @@ void smb_init_perfcount_data(struct smb_perfcount_data *pcd)
 
 bool smb_perfcount_init(void)
 {
+	const struct loadparm_substitution *lp_sub =
+		loadparm_s3_global_substitution();
 	char *perfcount_object;
 
-	perfcount_object = lp_perfcount_module(talloc_tos());
+	perfcount_object = lp_perfcount_module(talloc_tos(), lp_sub);
 
 	/* don't init */
 	if (!perfcount_object || !perfcount_object[0])