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 166cec23773397ba4880a7f2303834b4586617f2..c845f33474325c0a849484e0ee3aa268b0691d23 100644 (file)
--- 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 5ed577100e1681e7d658130fd2a2df01916d99d7..82b8248203190d4ba1077724bce3c55421313a41 100644 (file)
--- 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;