systemv/cancel.c: Merge fix from master

Master commit:
https://github.com/OpenPrinting/cups/commit/c5ad7aa

diff --git a/CHANGES.md b/CHANGES.md
index e9a2de85f2b8b1d3b0703aa401a9679d099b5934..0845940465965518f998b5590bf0a87aa073dd40 100644 (file)
--- 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 572f413e13695faf0e661fdfac756e332163f7b5..f5b8e12b5e5071233095c74a8dbac87d3a2f7fa8 100644 (file)
--- 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...