8399d83
diff -up cups-1.4.3/backend/dnssd.c.dnssd-deviceid.patch cups-1.4.3/backend/dnssd.c
8399d83
--- cups-1.4.3/backend/dnssd.c.dnssd-deviceid.patch	2010-04-16 19:36:12.226148774 +0100
8399d83
+++ cups-1.4.3/backend/dnssd.c	2010-04-16 19:39:53.314148240 +0100
8399d83
@@ -1192,15 +1192,22 @@ find_device (cups_array_t *devices,
8399d83
       if (device->device_id)
8399d83
         free(device->device_id);
8399d83
 
8399d83
+      if (device_id[0])
8399d83
+      {
8399d83
+	  /* Mark this as the real device ID. */
8399d83
+	  ptr = device_id + strlen(device_id);
8399d83
+	  snprintf(ptr, sizeof(device_id) - (ptr - device_id), "FZY:0;");
8399d83
+      }
8399d83
+
8399d83
       if (!device_id[0] && strcmp(model, "Unknown"))
8399d83
       {
8399d83
         if (make_and_model[0])
8399d83
-	  snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;",
8399d83
+	  snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;FZY:1;",
8399d83
 	           make_and_model, model);
8399d83
         else if (!strncasecmp(model, "designjet ", 10))
8399d83
-	  snprintf(device_id, sizeof(device_id), "MFG:HP;MDL:%s", model + 10);
8399d83
+	  snprintf(device_id, sizeof(device_id), "MFG:HP;MDL:%s;FZY:1;", model + 10);
8399d83
         else if (!strncasecmp(model, "stylus ", 7))
8399d83
-	  snprintf(device_id, sizeof(device_id), "MFG:EPSON;MDL:%s", model + 7);
8399d83
+	  snprintf(device_id, sizeof(device_id), "MFG:EPSON;MDL:%s;FZY:1;", model + 7);
8399d83
         else if ((ptr = strchr(model, ' ')) != NULL)
8399d83
 	{
8399d83
 	 /*
8399d83
@@ -1210,7 +1217,7 @@ find_device (cups_array_t *devices,
8399d83
           memcpy(make_and_model, model, ptr - model);
8399d83
 	  make_and_model[ptr - model] = '\0';
8399d83
 
8399d83
-	  snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s",
8399d83
+	  snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;FZY:1;",
8399d83
 		   make_and_model, ptr + 1);
8399d83
         }
8399d83
       }