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 82bf9e9312022900ef10c9c032fa388699b76e65..16e3623851352f359849ddc34f725bbe7931a513 100644 (file)
--- 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 c05f5c86b46ff4d3056f8595f6f629f94f77bf38..f75aa0a12ac3ae3fc8bf6a61dadd962b4b1763a0 100644 (file)
--- 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",