From 252083d8de7b062876eee80d31875f1a9c8ac20a Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 20 Sep 2023 16:20:45 +0200 Subject: [PATCH] systemv/cancel.c: Merge fix from master Master commit: https://github.com/OpenPrinting/cups/commit/c5ad7aa --- CHANGES.md | 10 ++++++++-- systemv/cancel.c | 8 +++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index e9a2de85f2..0845940465 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,11 @@ -CHANGES - OpenPrinting CUPS 2.4.7 - (2023-09-20) -================================================ +CHANGES - OpenPrinting CUPS 2.4.8 - TBA +======================================= + +Changes in CUPS v2.4.8 (TBA) +---------------------------- + +- Really backport fix for Issue #742 + Changes in CUPS v2.4.7 (2023-09-20) ----------------------------------- diff --git a/systemv/cancel.c b/systemv/cancel.c index 572f413e13..f5b8e12b5e 100644 --- a/systemv/cancel.c +++ b/systemv/cancel.c @@ -260,6 +260,7 @@ main(int argc, /* I - Number of command-line arguments */ * attributes-natural-language * printer-uri + job-id *or* job-uri * [requesting-user-name] + * [purge-job] or [purge-jobs] */ request = ippNewRequest(op); @@ -294,7 +295,12 @@ main(int argc, /* I - Number of command-line arguments */ "requesting-user-name", NULL, cupsUser()); if (purge) - ippAddBoolean(request, IPP_TAG_OPERATION, "purge-jobs", (char)purge); + { + if (op == IPP_CANCEL_JOB) + ippAddBoolean(request, IPP_TAG_OPERATION, "purge-job", (char)purge); + else + ippAddBoolean(request, IPP_TAG_OPERATION, "purge-jobs", (char)purge); + } /* * Do the request and get back a response... -- 2.47.2