diff options
| author | Ralph Boehme <slow@samba.org> | 2019-11-04 12:14:34 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2019-11-27 10:25:33 +0000 |
| commit | b98e1ad7711aac4f8914b960199c9ae3aa7cea69 (patch) | |
| tree | 8cb2c7dcdfa7820d2da174aa82d7abc06995cfc3 /source3/printing/print_generic.c | |
| parent | e95e1c2d4f8faf9dee82e7f51f95ca8451163336 (diff) | |
| download | samba-b98e1ad7711aac4f8914b960199c9ae3aa7cea69.tar.gz | |
smbdotconf: mark "printername" with substitution="1"
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/printing/print_generic.c')
| -rw-r--r-- | source3/printing/print_generic.c | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/source3/printing/print_generic.c b/source3/printing/print_generic.c index 574f357c76c..f9c7693b358 100644 --- a/source3/printing/print_generic.c +++ b/source3/printing/print_generic.c @@ -118,11 +118,13 @@ pause a job ****************************************************************************/ static int generic_job_pause(int snum, struct printjob *pjob) { + const struct loadparm_substitution *lp_sub = + loadparm_s3_global_substitution(); fstring jobstr; /* need to pause the spooled entry */ slprintf(jobstr, sizeof(jobstr)-1, "%d", pjob->sysjob); - return print_run_command(snum, lp_printername(talloc_tos(), snum), True, + return print_run_command(snum, lp_printername(talloc_tos(), lp_sub, snum), True, lp_lppause_command(snum), NULL, "%j", jobstr, NULL); @@ -133,11 +135,13 @@ resume a job ****************************************************************************/ static int generic_job_resume(int snum, struct printjob *pjob) { + const struct loadparm_substitution *lp_sub = + loadparm_s3_global_substitution(); fstring jobstr; /* need to pause the spooled entry */ slprintf(jobstr, sizeof(jobstr)-1, "%d", pjob->sysjob); - return print_run_command(snum, lp_printername(talloc_tos(), snum), True, + return print_run_command(snum, lp_printername(talloc_tos(), lp_sub, snum), True, lp_lpresume_command(snum), NULL, "%j", jobstr, NULL); @@ -208,6 +212,8 @@ static int generic_job_submit(int snum, struct printjob *pjob, char *lpq_cmd) { int ret = -1; + const struct loadparm_substitution *lp_sub = + loadparm_s3_global_substitution(); char *current_directory = NULL; char *print_directory = NULL; char *wd = NULL; @@ -259,7 +265,7 @@ static int generic_job_submit(int snum, struct printjob *pjob, slprintf(job_size, sizeof(job_size)-1, "%lu", (unsigned long)pjob->size); /* send it to the system spooler */ - ret = print_run_command(snum, lp_printername(talloc_tos(), snum), True, + ret = print_run_command(snum, lp_printername(talloc_tos(), lp_sub, snum), True, lp_print_command(snum), NULL, "%s", p, "%J", jobname, @@ -277,7 +283,7 @@ static int generic_job_submit(int snum, struct printjob *pjob, * determine the backend job identifier (sysjob). */ pjob->sysjob = -1; - ret = generic_queue_get(lp_printername(talloc_tos(), snum), + ret = generic_queue_get(lp_printername(talloc_tos(), lp_sub, snum), printing_type, lpq_cmd, &q, &status); if (ret > 0) { int i; @@ -312,7 +318,10 @@ static int generic_job_submit(int snum, struct printjob *pjob, ****************************************************************************/ static int generic_queue_pause(int snum) { - return print_run_command(snum, lp_printername(talloc_tos(), snum), True, + const struct loadparm_substitution *lp_sub = + loadparm_s3_global_substitution(); + + return print_run_command(snum, lp_printername(talloc_tos(), lp_sub, snum), True, lp_queuepause_command(snum), NULL, NULL); } @@ -321,7 +330,10 @@ static int generic_queue_pause(int snum) ****************************************************************************/ static int generic_queue_resume(int snum) { - return print_run_command(snum, lp_printername(talloc_tos(), snum), True, + const struct loadparm_substitution *lp_sub = + loadparm_s3_global_substitution(); + + return print_run_command(snum, lp_printername(talloc_tos(), lp_sub, snum), True, lp_queueresume_command(snum), NULL, NULL); } |