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

smbdotconf: mark "cups 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/cupsserver.xml b/docs-xml/smbdotconf/printing/cupsserver.xml
index 19bb769808f..c18c115723b 100644
--- a/docs-xml/smbdotconf/printing/cupsserver.xml
+++ b/docs-xml/smbdotconf/printing/cupsserver.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="cups 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_cups.c b/source3/printing/print_cups.c
index 53e6dd05dfb..6ad85498be3 100644
--- a/source3/printing/print_cups.c
+++ b/source3/printing/print_cups.c
@@ -108,14 +108,16 @@ cups_passwd_cb(const char *prompt)	/* I - Prompt */
 
 static http_t *cups_connect(TALLOC_CTX *frame)
 {
+	const struct loadparm_substitution *lp_sub =
+		loadparm_s3_global_substitution();
 	http_t *http = NULL;
 	char *server = NULL, *p = NULL;
 	int port;
 	int timeout = lp_cups_connection_timeout();
 	size_t size;
 
-	if (lp_cups_server(talloc_tos()) != NULL && strlen(lp_cups_server(talloc_tos())) > 0) {
-		if (!push_utf8_talloc(frame, &server, lp_cups_server(talloc_tos()), &size)) {
+	if (lp_cups_server(talloc_tos(), lp_sub) != NULL && strlen(lp_cups_server(talloc_tos(), lp_sub)) > 0) {
+		if (!push_utf8_talloc(frame, &server, lp_cups_server(talloc_tos(), lp_sub), &size)) {
 			return NULL;
 		}
 	} else {