diff options
| author | Michael Karcher <samba@mkarcher.dialup.fu-berlin.de> | 2010-03-24 17:33:21 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2010-03-24 17:33:21 -0700 |
| commit | 845c2281c7513bd3139a8f50b593658b32dbdb31 (patch) | |
| tree | f9709e619e55ae56fd35e837075b1789a0e232cd /source3/printing | |
| parent | 34674e0a61fe5b2983176e8c33aa48d43fd840ce (diff) | |
| download | samba-845c2281c7513bd3139a8f50b593658b32dbdb31.tar.gz samba-845c2281c7513bd3139a8f50b593658b32dbdb31.tar.bz2 samba-845c2281c7513bd3139a8f50b593658b32dbdb31.zip | |
Fix bug #7269 - Job management commands don't work for CUPS queues.
Samba needs to retrieve pjob->sysjob from the CUPS response (as
is done in the iprint backend).
Diffstat (limited to 'source3/printing')
| -rw-r--r-- | source3/printing/print_cups.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c index 804173f40f..fc1f52a8ef 100644 --- a/source3/printing/print_cups.c +++ b/source3/printing/print_cups.c @@ -905,6 +905,7 @@ static int cups_job_submit(int snum, struct printjob *pjob) http_t *http = NULL; /* HTTP connection to server */ ipp_t *request = NULL, /* IPP Request */ *response = NULL; /* IPP Response */ + ipp_attribute_t *attr_job_id = NULL; /* IPP Attribute "job-id" */ cups_lang_t *language = NULL; /* Default language */ char uri[HTTP_MAX_URI]; /* printer-uri attribute */ const char *clientname = NULL; /* hostname of client for job-originating-host attribute */ @@ -919,7 +920,7 @@ static int cups_job_submit(int snum, struct printjob *pjob) size_t size; char addr[INET6_ADDRSTRLEN]; - DEBUG(5,("cups_job_submit(%d, %p (%d))\n", snum, pjob, pjob->sysjob)); + DEBUG(5,("cups_job_submit(%d, %p)\n", snum, pjob)); /* * Make sure we don't ask for passwords... @@ -1026,6 +1027,13 @@ static int cups_job_submit(int snum, struct printjob *pjob) ippErrorString(cupsLastError()))); } else { ret = 0; + attr_job_id = ippFindAttribute(response, "job-id", IPP_TAG_INTEGER); + if(attr_job_id) { + pjob->sysjob = attr_job_id->values[0].integer; + DEBUG(5,("cups_job_submit: job-id %d\n", pjob->sysjob)); + } else { + DEBUG(0,("Missing job-id attribute in IPP response")); + } } } else { DEBUG(0,("Unable to print file to `%s' - %s\n", PRINTERNAME(snum), |