From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 15 Oct 2019 14:54:45 +0000 (+0200)
Subject: smbdotconf: mark "aio write behind" with substitution="1"
X-Git-Tag: ldb-2.1.0~588
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c23e3564fc2c7c9dc53c2d26ecbacb1d9682aba6;p=thirdparty%2Fsamba.git

smbdotconf: mark "aio write behind" with substitution="1"

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

diff --git a/docs-xml/smbdotconf/tuning/aiowritebehind.xml b/docs-xml/smbdotconf/tuning/aiowritebehind.xml
index c88cd97fa97..d60af7154fd 100644
--- a/docs-xml/smbdotconf/tuning/aiowritebehind.xml
+++ b/docs-xml/smbdotconf/tuning/aiowritebehind.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="aio write behind"
                  context="S"
 		 type="string"
+                 substitution="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>If Samba has been built with asynchronous I/O support,
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 1a708fc622c..196d757ea71 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -530,6 +530,8 @@ static NTSTATUS make_connection_snum(struct smbXsrv_connection *xconn,
 					const char *pdev)
 {
 	struct smbd_server_connection *sconn = xconn->client->sconn;
+	const struct loadparm_substitution *lp_sub =
+		loadparm_s3_global_substitution();
 	struct smb_filename *smb_fname_cpath = NULL;
 	fstring dev;
 	int ret;
@@ -824,7 +826,7 @@ static NTSTATUS make_connection_snum(struct smbXsrv_connection *xconn,
 		set_namearray( &conn->veto_oplock_list,
 			       lp_veto_oplock_files(talloc_tos(), snum));
 		set_namearray( &conn->aio_write_behind_list,
-				lp_aio_write_behind(talloc_tos(), snum));
+				lp_aio_write_behind(talloc_tos(), lp_sub, snum));
 	}
 	smb_fname_cpath = synthetic_smb_fname(talloc_tos(),
 					conn->connectpath,