|
Tim Waugh |
d08cd1 |
diff -up cups-1.4rc1/scheduler/ipp.c.str3258 cups-1.4rc1/scheduler/ipp.c
|
|
Tim Waugh |
d08cd1 |
--- cups-1.4rc1/scheduler/ipp.c.str3258 2009-07-15 09:58:15.559299247 +0100
|
|
Tim Waugh |
d08cd1 |
+++ cups-1.4rc1/scheduler/ipp.c 2009-07-15 09:58:47.981299548 +0100
|
|
Tim Waugh |
d08cd1 |
@@ -1721,8 +1721,7 @@ add_job(cupsd_client_t *con, /* I - Cl
|
|
Tim Waugh |
d08cd1 |
attr = ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_KEYWORD,
|
|
Tim Waugh |
d08cd1 |
"job-hold-until", NULL, val);
|
|
Tim Waugh |
d08cd1 |
}
|
|
Tim Waugh |
d08cd1 |
- if (attr && strcmp(attr->values[0].string.text, "no-hold") &&
|
|
Tim Waugh |
d08cd1 |
- !(printer->type & CUPS_PRINTER_REMOTE))
|
|
Tim Waugh |
d08cd1 |
+ if (attr && strcmp(attr->values[0].string.text, "no-hold"))
|
|
Tim Waugh |
d08cd1 |
{
|
|
Tim Waugh |
d08cd1 |
/*
|
|
Tim Waugh |
d08cd1 |
* Hold job until specified time...
|
|
Tim Waugh |
d08cd1 |
diff -up cups-1.4rc1/scheduler/job.c.str3258 cups-1.4rc1/scheduler/job.c
|
|
Tim Waugh |
d08cd1 |
--- cups-1.4rc1/scheduler/job.c.str3258 2009-07-15 09:58:15.627173602 +0100
|
|
Tim Waugh |
d08cd1 |
+++ cups-1.4rc1/scheduler/job.c 2009-07-15 09:58:47.984298957 +0100
|
|
Tim Waugh |
d08cd1 |
@@ -3095,7 +3095,8 @@ get_options(cupsd_job_t *job, /* I - Jo
|
|
Tim Waugh |
d08cd1 |
attr->value_tag == IPP_TAG_BEGIN_COLLECTION) /* Not yet supported */
|
|
Tim Waugh |
d08cd1 |
continue;
|
|
Tim Waugh |
d08cd1 |
|
|
Tim Waugh |
d08cd1 |
- if (!strncmp(attr->name, "time-", 5))
|
|
Tim Waugh |
d08cd1 |
+ if (!strncmp(attr->name, "time-", 5) ||
|
|
Tim Waugh |
d08cd1 |
+ !strcmp(attr->name, "job-hold-until"))
|
|
Tim Waugh |
d08cd1 |
continue;
|
|
Tim Waugh |
d08cd1 |
|
|
Tim Waugh |
d08cd1 |
if (!strncmp(attr->name, "job-", 4) &&
|