summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalph Boehme <slow@samba.org>2019-10-31 11:46:38 (GMT)
committerAndreas Schneider <asn@cryptomilk.org>2019-11-07 16:01:21 (GMT)
commit8846887a55b0c97a1639fc6ecb228941cf16b8f2 (patch)
treed268d59c43fa3b7506ff88adb252fef7b20b3128
parentede00779ab2d881e061adb9d861879e8c68e272b (diff)
downloadsamba-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