From: Ralph Boehme <slow@samba.org>
Date: Mon, 4 Nov 2019 16:52:37 +0000 (+0100)
Subject: smbdotconf: mark "iprint server" with substitution="1"
X-Git-Tag: ldb-2.1.0~544
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2a1f0c705bc2e1f0400e23892fde45de00032b4;p=thirdparty%2Fsamba.git

smbdotconf: mark "iprint server" 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/iprintserver.xml b/docs-xml/smbdotconf/printing/iprintserver.xml
index 82bf9e93120..16e36238513 100644
--- a/docs-xml/smbdotconf/printing/iprintserver.xml
+++ b/docs-xml/smbdotconf/printing/iprintserver.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="iprint server"
                  context="G"
                  type="string"
+                 substitution="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
diff --git a/source3/printing/print_iprint.c b/source3/printing/print_iprint.c
index c05f5c86b46..f75aa0a12ac 100644
--- a/source3/printing/print_iprint.c
+++ b/source3/printing/print_iprint.c
@@ -93,7 +93,9 @@ iprint_passwd_cb(const char *prompt)	/* I - Prompt */
 
 static const char *iprint_server(void)
 {
-	const char *server = lp_iprint_server(talloc_tos());
+	const struct loadparm_substitution *lp_sub =
+		loadparm_s3_global_substitution();
+	const char *server = lp_iprint_server(talloc_tos(), lp_sub);
 
 	if ((server != NULL) && (strlen(server) > 0)) {
 		DEBUG(10, ("iprint server explicitly set to %s\n",