summaryrefslogtreecommitdiff
path: root/source3/printing
diff options
context:
space:
mode:
authorDavid Disseldorp <ddiss@samba.org>2012-01-30 13:44:33 +0100
committerDavid Disseldorp <ddiss@samba.org>2012-06-26 16:10:39 +0200
commita66618f40223dfb0ef544169e32bfa074587df29 (patch)
treea19a788967df93353138ef8863988946363b1861 /source3/printing
parenta2d880ddcda4c0f5227945b644f8abe6af4a276d (diff)
downloadsamba-a66618f40223dfb0ef544169e32bfa074587df29.tar.gz
samba-a66618f40223dfb0ef544169e32bfa074587df29.tar.bz2
samba-a66618f40223dfb0ef544169e32bfa074587df29.zip
s3-printing: remove print_parse_jobid() from print_cups.c
The spoolss print job identifier is now passed to the cups layer via struct printjob, therefore it is no longer necessary to parse the job filename to determine it.
Diffstat (limited to 'source3/printing')
-rw-r--r--source3/printing/print_cups.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c
index 79b146c076..fd052df17f 100644
--- a/source3/printing/print_cups.c
+++ b/source3/printing/print_cups.c
@@ -871,7 +871,6 @@ static int cups_job_submit(int snum, struct printjob *pjob)
char *cupsoptions = NULL;
char *filename = NULL;
size_t size;
- uint32_t jobid = (uint32_t)-1;
DEBUG(5,("cups_job_submit(%d, %p)\n", snum, pjob));
@@ -933,21 +932,12 @@ static int cups_job_submit(int snum, struct printjob *pjob)
"job-originating-host-name", NULL,
pjob->clientmachine);
- /* Get the jobid from the filename. */
- jobid = print_parse_jobid(pjob->filename);
- if (jobid == (uint32_t)-1) {
- DEBUG(0,("cups_job_submit: failed to parse jobid from name %s\n",
- pjob->filename ));
- jobid = 0;
- }
-
if (!push_utf8_talloc(frame, &jobname, pjob->jobname, &size)) {
goto out;
}
new_jobname = talloc_asprintf(frame,
"%s%.8u %s", PRINT_SPOOL_PREFIX,
- (unsigned int)jobid,
- jobname);
+ pjob->jobid, jobname);
if (new_jobname == NULL) {
goto out;
}