smbdotconf: mark "addport command" 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/addportcommand.xml b/docs-xml/smbdotconf/printing/addportcommand.xml
index 7a35c5266d92ab5ddeff03aab0fe4ca01f89b439..c25794ba7945117032e78ca118aa7271812e466f 100644 (file)
--- a/docs-xml/smbdotconf/printing/addportcommand.xml
+++ b/docs-xml/smbdotconf/printing/addportcommand.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="addport command"
                  context="G"
                  type="string"
+                 substitution="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>Samba 3.0.23 introduced support for adding printer ports

diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index c80996532ad52d961775a94c54b81362f3309b37..dfb3c0718b42b70b1e9ce9f5640856cd45d79da1 100644 (file)
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -6363,7 +6363,9 @@ static bool check_printer_ok(TALLOC_CTX *mem_ctx,
 
 static WERROR add_port_hook(TALLOC_CTX *ctx, struct security_token *token, const char *portname, const char *uri)
 {
-       char *cmd = lp_addport_command(talloc_tos());
+       const struct loadparm_substitution *lp_sub =
+               loadparm_s3_global_substitution();
+       char *cmd = lp_addport_command(talloc_tos(), lp_sub);
        char *command = NULL;
        int ret;
        bool is_print_op = false;