From: Ralph Boehme <slow@samba.org>
Date: Tue, 5 Nov 2019 10:03:23 +0000 (+0100)
Subject: smbdotconf: mark "os2 driver map" with substitution="1"
X-Git-Tag: ldb-2.1.0~538
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f3cfef87854ccc27e037501c578fccb712791385;p=thirdparty%2Fsamba.git

smbdotconf: mark "os2 driver map" with substitution="1"

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

diff --git a/docs-xml/smbdotconf/printing/os2drivermap.xml b/docs-xml/smbdotconf/printing/os2drivermap.xml
index 166cec23773..c845f334743 100644
--- a/docs-xml/smbdotconf/printing/os2drivermap.xml
+++ b/docs-xml/smbdotconf/printing/os2drivermap.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="os2 driver map"
                  context="G"
                  type="string"
+                 substitution="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>The parameter is used to define the absolute
diff --git a/source3/printing/nt_printing_os2.c b/source3/printing/nt_printing_os2.c
index 5ed577100e1..82b82482031 100644
--- a/source3/printing/nt_printing_os2.c
+++ b/source3/printing/nt_printing_os2.c
@@ -73,7 +73,9 @@ static bool set_driver_mapping(const char *from, const char *to)
  */
 WERROR spoolss_map_to_os2_driver(TALLOC_CTX *mem_ctx, const char **pdrivername)
 {
-	const char *mapfile = lp_os2_driver_map(talloc_tos());
+	const struct loadparm_substitution *lp_sub =
+		loadparm_s3_global_substitution();
+	const char *mapfile = lp_os2_driver_map(talloc_tos(), lp_sub);
 	char **lines = NULL;
 	const char *drivername;
 	int numlines = 0;