From: Pranav Batra <batrapranav@chromium.org>
Date: Wed, 28 Oct 2020 04:14:16 +0000 (+0000)
Subject: Fix handling of the output-bin and print-quality IPP attributes
X-Git-Tag: v2.3.3op1~58^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b11dcf61b96aa51a3becaeb905339fb44a75f050;p=thirdparty%2Fcups.git

Fix handling of the output-bin and print-quality IPP attributes

The PPD generation code now works for printers that support a single
output bin. Also the PPD parsing code now parses the cupsPrintQuality
field which is generated by the PPD generation code.
---

diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
index aeec8c55ab..5c10eadf47 100644
--- a/cups/ppd-cache.c
+++ b/cups/ppd-cache.c
@@ -3929,7 +3929,7 @@ _ppdCreateFromIPP(char   *buffer,	/* I - Filename buffer */
   else
     strlcpy(ppdname, "Unknown", sizeof(ppdname));
 
-  if ((attr = ippFindAttribute(response, "output-bin-supported", IPP_TAG_ZERO)) != NULL && (count = ippGetCount(attr)) > 1)
+  if ((attr = ippFindAttribute(response, "output-bin-supported", IPP_TAG_ZERO)) != NULL && (count = ippGetCount(attr)) > 0)
   {
     ipp_attribute_t	*trays = ippFindAttribute(response, "printer-output-tray", IPP_TAG_STRING);
 					/* printer-output-tray attribute, if any */
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 8f67c2bad8..23feb3429f 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -4019,7 +4019,8 @@ load_ppd(cupsd_printer_t *p)		/* I - Printer */
 
     num_qualities = 0;
 
-    if ((output_mode = ppdFindOption(ppd, "OutputMode")) != NULL)
+    if ((output_mode = ppdFindOption(ppd, "OutputMode")) ||
+        (output_mode = ppdFindOption(ppd, "cupsPrintQuality")))
     {
       if (ppdFindChoice(output_mode, "draft") ||
           ppdFindChoice(output_mode, "fast"))