cups/patches/cups-dnssd-deviceid.patch

   1 diff -up cups-1.4.3/backend/dnssd.c.dnssd-deviceid.patch cups-1.4.3/backend/dnssd.c
   2 --- cups-1.4.3/backend/dnssd.c.dnssd-deviceid.patch     2010-04-16 19:36:12.226148774 +0100
   3 +++ cups-1.4.3/backend/dnssd.c  2010-04-16 19:39:53.314148240 +0100
   4 @@ -1192,15 +1192,22 @@ find_device (cups_array_t *devices,
   5        if (device->device_id)
   6          free(device->device_id);
   7
   8 +      if (device_id[0])
   9 +      {
  10 +         /* Mark this as the real device ID. */
  11 +         ptr = device_id + strlen(device_id);
  12 +         snprintf(ptr, sizeof(device_id) - (ptr - device_id), "FZY:0;");
  13 +      }
  14 +
  15        if (!device_id[0] && strcmp(model, "Unknown"))
  16        {
  17          if (make_and_model[0])
  18 -         snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;",
  19 +         snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;FZY:1;",
  20                    make_and_model, model);
  21          else if (!strncasecmp(model, "designjet ", 10))
  22 -         snprintf(device_id, sizeof(device_id), "MFG:HP;MDL:%s", model + 10);
  23 +         snprintf(device_id, sizeof(device_id), "MFG:HP;MDL:%s;FZY:1;", model + 10);
  24          else if (!strncasecmp(model, "stylus ", 7))
  25 -         snprintf(device_id, sizeof(device_id), "MFG:EPSON;MDL:%s", model + 7);
  26 +         snprintf(device_id, sizeof(device_id), "MFG:EPSON;MDL:%s;FZY:1;", model + 7);
  27          else if ((ptr = strchr(model, ' ')) != NULL)
  28         {
  29          /*
  30 @@ -1210,7 +1217,7 @@ find_device (cups_array_t *devices,
  31            memcpy(make_and_model, model, ptr - model);
  32           make_and_model[ptr - model] = '\0';
  33
  34 -         snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s",
  35 +         snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;FZY:1;",
  36                    make_and_model, ptr + 1);
  37          }
  38        }