8399d834ef
CVE-2010-0540, CVE-2010-0542, CVE-2010-1748. No longer need str3503,
str3399, str3505, str3541, str3425p2 or CVE-2010-0302 patches.
- Fix lpd provides.
- Added comments for all sources and patches.
- Reset status after successful ipp job (bug #548219, STR #3460).
- Install udev rules in correct place (bug #530378).
- Removed unapplied gnutls-gcrypt-threads patch. Fixed typos in
descriptions for lpd and php sub-packages.
- Add an SNMP query for Ricoh's device ID OID (STR #3552).
- Mark DNS-SD Device IDs that have been guessed at with "FZY:1;".
- Add an SNMP query for HP's device ID OID (STR #3552).
39 lines
1.6 KiB
Diff
39 lines
1.6 KiB
Diff
diff -up cups-1.4.3/backend/dnssd.c.dnssd-deviceid.patch cups-1.4.3/backend/dnssd.c
|
|
--- cups-1.4.3/backend/dnssd.c.dnssd-deviceid.patch 2010-04-16 19:36:12.226148774 +0100
|
|
+++ cups-1.4.3/backend/dnssd.c 2010-04-16 19:39:53.314148240 +0100
|
|
@@ -1192,15 +1192,22 @@ find_device (cups_array_t *devices,
|
|
if (device->device_id)
|
|
free(device->device_id);
|
|
|
|
+ if (device_id[0])
|
|
+ {
|
|
+ /* Mark this as the real device ID. */
|
|
+ ptr = device_id + strlen(device_id);
|
|
+ snprintf(ptr, sizeof(device_id) - (ptr - device_id), "FZY:0;");
|
|
+ }
|
|
+
|
|
if (!device_id[0] && strcmp(model, "Unknown"))
|
|
{
|
|
if (make_and_model[0])
|
|
- snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;",
|
|
+ snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;FZY:1;",
|
|
make_and_model, model);
|
|
else if (!strncasecmp(model, "designjet ", 10))
|
|
- snprintf(device_id, sizeof(device_id), "MFG:HP;MDL:%s", model + 10);
|
|
+ snprintf(device_id, sizeof(device_id), "MFG:HP;MDL:%s;FZY:1;", model + 10);
|
|
else if (!strncasecmp(model, "stylus ", 7))
|
|
- snprintf(device_id, sizeof(device_id), "MFG:EPSON;MDL:%s", model + 7);
|
|
+ snprintf(device_id, sizeof(device_id), "MFG:EPSON;MDL:%s;FZY:1;", model + 7);
|
|
else if ((ptr = strchr(model, ' ')) != NULL)
|
|
{
|
|
/*
|
|
@@ -1210,7 +1217,7 @@ find_device (cups_array_t *devices,
|
|
memcpy(make_and_model, model, ptr - model);
|
|
make_and_model[ptr - model] = '\0';
|
|
|
|
- snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s",
|
|
+ snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;FZY:1;",
|
|
make_and_model, ptr + 1);
|
|
}
|
|
}
|