|
 |
1d75c0 |
diff -up cups-2.1.4/backend/dnssd.c.dnssd-deviceid cups-2.1.4/backend/dnssd.c
|
|
|
1d75c0 |
--- cups-2.1.4/backend/dnssd.c.dnssd-deviceid 2016-06-15 14:36:19.922353606 +0200
|
|
|
1d75c0 |
+++ cups-2.1.4/backend/dnssd.c 2016-06-15 14:45:45.794966648 +0200
|
|
|
1d75c0 |
@@ -1188,15 +1188,22 @@ query_callback(
|
|
|
1d75c0 |
if (device->device_id)
|
|
|
1d75c0 |
free(device->device_id);
|
|
|
1d75c0 |
|
|
|
1d75c0 |
+if (device_id[0])
|
|
|
1d75c0 |
+{
|
|
|
1d75c0 |
+ /* Mark this as the real device ID. */
|
|
|
1d75c0 |
+ ptr = device_id + strlen(device_id);
|
|
|
1d75c0 |
+ snprintf(ptr, sizeof(device_id) - (ptr - device_id), "FZY:0;");
|
|
|
1d75c0 |
+}
|
|
|
1d75c0 |
+
|
|
|
1d75c0 |
if (!device_id[0] && strcmp(model, "Unknown"))
|
|
|
1d75c0 |
{
|
|
|
1d75c0 |
if (make_and_model[0])
|
|
|
1d75c0 |
- snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;",
|
|
|
1d75c0 |
+ snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;FZY:1;",
|
|
|
1d75c0 |
make_and_model, model);
|
|
|
1d75c0 |
else if (!_cups_strncasecmp(model, "designjet ", 10))
|
|
|
1d75c0 |
- snprintf(device_id, sizeof(device_id), "MFG:HP;MDL:%s;", model + 10);
|
|
|
1d75c0 |
+ snprintf(device_id, sizeof(device_id), "MFG:HP;MDL:%s;FZY:1;", model + 10);
|
|
|
1d75c0 |
else if (!_cups_strncasecmp(model, "stylus ", 7))
|
|
|
1d75c0 |
- snprintf(device_id, sizeof(device_id), "MFG:EPSON;MDL:%s;", model + 7);
|
|
|
1d75c0 |
+ snprintf(device_id, sizeof(device_id), "MFG:EPSON;MDL:%s;FZY:1;", model + 7);
|
|
|
1d75c0 |
else if ((ptr = strchr(model, ' ')) != NULL)
|
|
|
1d75c0 |
{
|
|
|
1d75c0 |
/*
|
|
|
1d75c0 |
@@ -1206,7 +1213,7 @@ query_callback(
|
|
|
1d75c0 |
memcpy(make_and_model, model, (size_t)(ptr - model));
|
|
|
1d75c0 |
make_and_model[ptr - model] = '\0';
|
|
|
1d75c0 |
|
|
|
1d75c0 |
- snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;",
|
|
|
1d75c0 |
+ snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;FZY:1;",
|
|
|
1d75c0 |
make_and_model, ptr + 1);
|
|
|
1d75c0 |
}
|
|
|
1d75c0 |
}
|