diff options
author | Ralph Boehme <slow@samba.org> | 2019-10-31 12:46:38 +0100 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2019-11-07 16:01:21 +0000 |
commit | 8846887a55b0c97a1639fc6ecb228941cf16b8f2 (patch) | |
tree | d268d59c43fa3b7506ff88adb252fef7b20b3128 /docs-xml/smbdotconf/printing | |
parent | ede00779ab2d881e061adb9d861879e8c68e272b (diff) | |
download | samba-8846887a55b0c97a1639fc6ecb228941cf16b8f2.tar.gz |
s3:printing: Fix %J substition
print_run_command() uses lp_print_command() which internally performs basic
substition by calling talloc_sub_basic(). As a result. any of the variables in
the "basic set", including "%J" are already substituted.
To prevent the unwanted subtitution, we declare all affected configuration
options as const, which disabled the basic substition.
As a result print_run_command() can run manual substitution on all characters,
including %J, in the variadic argument list *before* calling lp_string() to run
basic substition which we had disabled before with the const.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13745
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Thu Nov 7 16:01:21 UTC 2019 on sn-devel-184
Diffstat (limited to 'docs-xml/smbdotconf/printing')
-rw-r--r-- | docs-xml/smbdotconf/printing/lppausecommand.xml | 1 | ||||
-rw-r--r-- | docs-xml/smbdotconf/printing/lpqcommand.xml | 1 | ||||
-rw-r--r-- | docs-xml/smbdotconf/printing/lpresumecommand.xml | 1 | ||||
-rw-r--r-- | docs-xml/smbdotconf/printing/lprmcommand.xml | 1 | ||||
-rw-r--r-- | docs-xml/smbdotconf/printing/printcommand.xml | 1 | ||||
-rw-r--r-- | docs-xml/smbdotconf/printing/queuepausecommand.xml | 1 | ||||
-rw-r--r-- | docs-xml/smbdotconf/printing/queueresumecommand.xml | 1 |
7 files changed, 7 insertions, 0 deletions
diff --git a/docs-xml/smbdotconf/printing/lppausecommand.xml b/docs-xml/smbdotconf/printing/lppausecommand.xml index 3aa134c4377..f2518d3def0 100644 --- a/docs-xml/smbdotconf/printing/lppausecommand.xml +++ b/docs-xml/smbdotconf/printing/lppausecommand.xml @@ -1,6 +1,7 @@ <samba:parameter name="lppause command" context="S" type="string" + constant="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <description> <para>This parameter specifies the command to be diff --git a/docs-xml/smbdotconf/printing/lpqcommand.xml b/docs-xml/smbdotconf/printing/lpqcommand.xml index f3c17f286d1..f0161f3448d 100644 --- a/docs-xml/smbdotconf/printing/lpqcommand.xml +++ b/docs-xml/smbdotconf/printing/lpqcommand.xml @@ -1,6 +1,7 @@ <samba:parameter name="lpq command" context="S" type="string" + constant="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <description> <para>This parameter specifies the command to be diff --git a/docs-xml/smbdotconf/printing/lpresumecommand.xml b/docs-xml/smbdotconf/printing/lpresumecommand.xml index 153ba76a693..2cee574bd73 100644 --- a/docs-xml/smbdotconf/printing/lpresumecommand.xml +++ b/docs-xml/smbdotconf/printing/lpresumecommand.xml @@ -1,6 +1,7 @@ <samba:parameter name="lpresume command" context="S" type="string" + constant="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <description> <para>This parameter specifies the command to be diff --git a/docs-xml/smbdotconf/printing/lprmcommand.xml b/docs-xml/smbdotconf/printing/lprmcommand.xml index 4b7f3dd75c3..a595c1225c0 100644 --- a/docs-xml/smbdotconf/printing/lprmcommand.xml +++ b/docs-xml/smbdotconf/printing/lprmcommand.xml @@ -1,6 +1,7 @@ <samba:parameter name="lprm command" context="S" type="string" + constant="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <description> <para>This parameter specifies the command to be diff --git a/docs-xml/smbdotconf/printing/printcommand.xml b/docs-xml/smbdotconf/printing/printcommand.xml index c84e45f404d..42a7188cb9a 100644 --- a/docs-xml/smbdotconf/printing/printcommand.xml +++ b/docs-xml/smbdotconf/printing/printcommand.xml @@ -1,6 +1,7 @@ <samba:parameter name="print command" context="S" type="string" + constant="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <description> <para>After a print job has finished spooling to diff --git a/docs-xml/smbdotconf/printing/queuepausecommand.xml b/docs-xml/smbdotconf/printing/queuepausecommand.xml index 5dca45657cc..600a2baa621 100644 --- a/docs-xml/smbdotconf/printing/queuepausecommand.xml +++ b/docs-xml/smbdotconf/printing/queuepausecommand.xml @@ -1,6 +1,7 @@ <samba:parameter name="queuepause command" context="S" type="string" + constant="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <description> <para>This parameter specifies the command to be diff --git a/docs-xml/smbdotconf/printing/queueresumecommand.xml b/docs-xml/smbdotconf/printing/queueresumecommand.xml index 4a573330048..431295a804e 100644 --- a/docs-xml/smbdotconf/printing/queueresumecommand.xml +++ b/docs-xml/smbdotconf/printing/queueresumecommand.xml @@ -1,6 +1,7 @@ <samba:parameter name="queueresume command" context="S" type="string" + constant="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <description> <para>This parameter specifies the command to be |