From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Wed, 29 May 2024 06:44:35 +0000 (+0200)
Subject: ppd-cache.c: Fix generating cupsUrfSupported (fixes #952)
X-Git-Tag: v2.4.9~6^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F968%2Fhead;p=thirdparty%2Fcups.git

ppd-cache.c: Fix generating cupsUrfSupported (fixes #952)

The PPD keyword got the option values concatenated together without
commas, which broke filter processing in libcupsfilters

Sometimes more commas better commas :)
---

diff --git a/CHANGES.md b/CHANGES.md
index c8349081d4..c10fdd0c35 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,6 +4,7 @@ CHANGES - OpenPrinting CUPS 2.4.9 - (TBA)
 Changes in CUPS v2.4.9 (TBA)
 ----------------------------
 
+- Fixed creating of `cupsUrfSupported` PPD keyword (Issue #952)
 - Fixed searching for destinations in web ui (Issue #954)
 - Fixed TLS negotiation using OpenSSL with servers that require the TLS SNI
   extension.
diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
index 3650f40f02..e750fccd48 100644
--- a/cups/ppd-cache.c
+++ b/cups/ppd-cache.c
@@ -3511,7 +3511,7 @@ _ppdCreateFromIPP2(
     for (i = 0, count = ippGetCount(attr); i < count; i ++)
     {
       keyword = ippGetString(attr, i, NULL);
-      cupsFilePrintf(fp, "%s%s", keyword, i ? "" : ",");
+      cupsFilePrintf(fp, "%s%s", keyword, i != count - 1 ? "," : "");
     }
     cupsFilePuts(fp, "\"\n");
   }