Merge changes from CUPS 1.4.0 (r8756)

[thirdparty/cups.git] / backend / ieee1284.c

diff --git a/backend/ieee1284.c b/backend/ieee1284.c
index edf7efe1b7751079f4776f01d682326b3044379b..dfb9c9c70cf1b08740c8693ef7db65f0a1563cbd 100644 (file)
--- a/backend/ieee1284.c
+++ b/backend/ieee1284.c
@@ -306,6 +306,14 @@ backendGetDeviceID(
       mfg = temp;
     }
 
+    if (!strncasecmp(mdl, mfg, strlen(mfg)))
+    {
+      mdl += strlen(mfg);
+
+      while (isspace(*mdl & 255))
+        mdl ++;
+    }
+
    /*
     * Generate the device URI from the manufacturer, make_model, and
     * serial number strings.