From: Michael R Sweet <msweet@msweet.org>
Date: Mon, 20 Jan 2025 17:27:25 +0000 (-0500)
Subject: Force copies to 1 for banner and raster files (Issue #1143)
X-Git-Tag: v2.4.12~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1518ad5b85f13da6325454e76ac2bd2e17ce89dd;p=thirdparty%2Fcups.git

Force copies to 1 for banner and raster files (Issue #1143)
---

diff --git a/CHANGES.md b/CHANGES.md
index 319b6e2833..7100f33ff1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,7 @@ Changes in CUPS v2.4.12 (YYYY-MM-DD)
 - Fixed a bug in the make-and-model whitespace trimming code (Issue #1096)
 - Fixed a removal of IPP Everywhere permanent queue if installation failed (Issue #1102)
 - Fixed `ServerToken None` in scheduler (Issue #1111)
+- Fixed client raster printing from macOS (Issue #1143)
 - Fixed the default User-Agent string.
 - Fixed a recursion issue in `ippReadIO`.
 
diff --git a/scheduler/job.c b/scheduler/job.c
index 822a247401..f45fb1ec81 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1,7 +1,7 @@
 /*
  * Job management routines for the CUPS scheduler.
  *
- * Copyright © 2020-2024 by OpenPrinting.
+ * Copyright © 2020-2025 by OpenPrinting.
  * Copyright © 2007-2019 by Apple Inc.
  * Copyright © 1997-2007 by Easy Software Products, all rights reserved.
  *
@@ -9,10 +9,6 @@
  * information.
  */
 
-/*
- * Include necessary headers...
- */
-
 #include "cupsd.h"
 #include <grp.h>
 #include <cups/backend.h>
@@ -870,6 +866,9 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
     goto abort_job;
   }
 
+  if (banner_page || (!strcmp(job->filetypes[job->current_file]->super, "image") && (!strcmp(job->filetypes[job->current_file]->type, "pwg-raster") || !strcmp(job->filetypes[job->current_file]->type, "urf"))))
+    strlcpy(copies, "1", sizeof(copies));
+
  /*
   * Build the command-line arguments for the filters.  Each filter
   * has 6 or 7 arguments: