From: Michael R Sweet <msweet@msweet.org>
Date: Thu, 30 Apr 2026 21:29:26 +0000 (-0400)
Subject: Handle some more compound makes (Issue #1313)
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;ds=sidebyside;p=thirdparty%2Fcups.git

Handle some more compound makes (Issue #1313)
---

diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
index 22ef145303..538e787cb0 100644
--- a/cups/ppd-cache.c
+++ b/cups/ppd-cache.c
@@ -3339,7 +3339,12 @@ _ppdCreateFromIPP(char   *buffer,	/* I - Filename buffer */
     cupsCopyString(make, "Unknown", sizeof(make));
   }
 
-  if (!_cups_strncasecmp(make, "Hewlett Packard ", 16) || !_cups_strncasecmp(make, "Hewlett-Packard ", 16))
+  if (!_cups_strncasecmp(make, "Fuji Xerox ", 11))
+  {
+    model = make + 11;
+    cupsCopyString(make, "Fuji Xerox", sizeof(make));
+  }
+  else if (!_cups_strncasecmp(make, "Hewlett Packard ", 16) || !_cups_strncasecmp(make, "Hewlett-Packard ", 16))
   {
    /*
     * Normalize HP printer make and model...
@@ -3351,6 +3356,11 @@ _ppdCreateFromIPP(char   *buffer,	/* I - Filename buffer */
     if (!_cups_strncasecmp(model, "HP ", 3))
       model += 3;
   }
+  else if (!_cups_strncasecmp(make, "KONICA MINOLTA ", 15))
+  {
+    model = make + 15;
+    cupsCopyString(make, "KONICA MINOLTA", sizeof(make));
+  }
   else if ((mptr = strchr(make, ' ')) != NULL)
   {
    /*