sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00
Code Activity

s3:printing: Fix %J substition

Browse Source 
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
This commit is contained in:
Ralph Boehme
2019-10-31 12:46:38 +01:00
committed by Andreas Schneider
parent ede00779ab
commit 8846887a55
10 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs-xml/smbdotconf/printing/lppausecommand.xml
View File

@ -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

1
docs-xml/smbdotconf/printing/lpqcommand.xml
View File

@ -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

1
docs-xml/smbdotconf/printing/lpresumecommand.xml
View File

@ -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

1
docs-xml/smbdotconf/printing/lprmcommand.xml
View File

@ -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

1
docs-xml/smbdotconf/printing/printcommand.xml
View File

@ -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

1
docs-xml/smbdotconf/printing/queuepausecommand.xml
View File

@ -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

1
docs-xml/smbdotconf/printing/queueresumecommand.xml
View File

@ -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