diff options
author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2013-02-20 15:22:35 +0000 |
---|---|---|
committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2013-02-20 15:22:35 +0000 |
commit | c5b24bfa983a8b50262d8c3dd037e0181cfaae61 (patch) | |
tree | 1c2ae049d3edbd3ae851dc21bfed4b9b0f931a55 /backend | |
parent | db8b865d20076ba51626da16bb3a2e080b7d1104 (diff) |
Merge changes from CUPS 1.7svn-r10874.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@4189 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'backend')
-rw-r--r-- | backend/ipp.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/backend/ipp.c b/backend/ipp.c index ff06a4bad..8eed33067 100644 --- a/backend/ipp.c +++ b/backend/ipp.c @@ -262,6 +262,7 @@ main(int argc, /* I - Number of command-line args */ ipp_attribute_t *copies_sup; /* copies-supported */ ipp_attribute_t *cups_version; /* cups-version */ ipp_attribute_t *format_sup; /* document-format-supported */ + ipp_attribute_t *job_auth; /* job-authorization-uri */ ipp_attribute_t *media_col_sup; /* media-col-supported */ ipp_attribute_t *operations_sup; /* operations-supported */ ipp_attribute_t *doc_handling_sup; /* multiple-document-handling-supported */ @@ -1402,13 +1403,21 @@ main(int argc, /* I - Number of command-line args */ copies_sup ? copies : 1, document_format, pc, ppd, media_col_sup, doc_handling_sup, print_color_mode); - ippDelete(cupsDoRequest(http, request, resource)); + response = cupsDoRequest(http, request, resource); ipp_status = cupsLastError(); fprintf(stderr, "DEBUG: Validate-Job: %s (%s)\n", ippErrorString(ipp_status), cupsLastErrorString()); + if ((job_auth = ippFindAttribute(response, "job-authorization-uri", + IPP_TAG_URI)) != NULL) + num_options = cupsAddOption("job-authorization-uri", + ippGetString(job_auth, 0, NULL), num_options, + &options); + + ippDelete(response); + if (job_canceled) break; |