rpms/cups
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- The scheduler did not use the Get-Job-Attributes policy for a printer

Browse Source 
(STR #3431).
This commit is contained in:
Tim Waugh 2009-12-08 12:34:48 +00:00
parent a29a9cb771
commit f5ad921fed
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
cups-str3431.patch Normal file
View File

@ -0,0 +1,32 @@
diff -up cups-1.4.2/scheduler/ipp.c.str3431 cups-1.4.2/scheduler/ipp.c
--- cups-1.4.2/scheduler/ipp.c.str3431 2009-12-08 12:28:21.095374048 +0000
+++ cups-1.4.2/scheduler/ipp.c 2009-12-08 12:32:03.829498891 +0000
@@ -7183,6 +7183,7 @@ get_job_attrs(cupsd_client_t *con, /* I
ipp_attribute_t *attr; /* Current attribute */
int jobid; /* Job ID */
cupsd_job_t *job; /* Current job */
+ cupsd_printer_t *printer; /* Current printer */
char scheme[HTTP_MAX_URI], /* Method portion of URI */
username[HTTP_MAX_URI], /* Username portion of URI */
host[HTTP_MAX_URI], /* Host portion of URI */
@@ -7257,7 +7258,19 @@ get_job_attrs(cupsd_client_t *con, /* I
* Check policy...
*/
- if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
+ if ((printer = job->printer) == NULL)
+ printer = cupsdFindDest(job->dest);
+
+ if (printer)
+ {
+ if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con,
+ NULL)) != HTTP_OK)
+ {
+ send_http_error(con, status, printer);
+ return;
+ }
+ }
+ else if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
{
send_http_error(con, status, NULL);
return;

4
cups.spec
View File

@ -69,6 +69,7 @@ Patch44: cups-str3435.patch
Patch45: cups-str3436.patch
Patch46: cups-str3425.patch
Patch47: cups-str3428.patch
Patch48: cups-str3431.patch
Patch100: cups-lspp.patch
@ -245,6 +246,7 @@ module.
%patch45 -p1 -b .str3436
%patch46 -p1 -b .str3425
%patch47 -p1 -b .str3428
%patch48 -p1 -b .str3431
%if %lspp
%patch100 -p1 -b .lspp
@ -536,6 +538,8 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Tue Dec 8 2009 Tim Waugh <twaugh@redhat.com> - 1:1.4.2-14
- The scheduler did not use the Get-Job-Attributes policy for a
printer (STR #3431).
- The scheduler added two job-name attributes to each job object
(STR #3428).
- The scheduler did not clean out completed jobs when