From: Ralph Boehme <slow@samba.org>
Date: Mon, 4 Nov 2019 11:30:58 +0000 (+0100)
Subject: smbdotconf: mark "veto oplock files" with substitution="1"
X-Git-Tag: ldb-2.1.0~570
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=18bd0c38f506876fd51c2bf54672b4e257364023;p=thirdparty%2Fsamba.git

smbdotconf: mark "veto oplock files" with substitution="1"

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

diff --git a/docs-xml/smbdotconf/filename/vetooplockfiles.xml b/docs-xml/smbdotconf/filename/vetooplockfiles.xml
index dde3705a1c1..8d6a9224953 100644
--- a/docs-xml/smbdotconf/filename/vetooplockfiles.xml
+++ b/docs-xml/smbdotconf/filename/vetooplockfiles.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="veto oplock files"
                  context="S"
                  type="string"
+                 substitution="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
  <description>
 	<para>
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 54979f77ffb..a1a2b97c1f3 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -828,7 +828,7 @@ static NTSTATUS make_connection_snum(struct smbXsrv_connection *xconn,
 		set_namearray( &conn->hide_list,
 			       lp_hide_files(talloc_tos(), lp_sub, snum));
 		set_namearray( &conn->veto_oplock_list,
-			       lp_veto_oplock_files(talloc_tos(), snum));
+			       lp_veto_oplock_files(talloc_tos(), lp_sub, snum));
 		set_namearray( &conn->aio_write_behind_list,
 				lp_aio_write_behind(talloc_tos(), lp_sub, snum));
 	}