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).
22 lines
1.3 KiB
Diff
22 lines
1.3 KiB
Diff
diff -up cups-1.4.3/backend/snmp.c.ricoh-deviceid-oid cups-1.4.3/backend/snmp.c
|
|
--- cups-1.4.3/backend/snmp.c.ricoh-deviceid-oid 2010-05-11 17:30:57.266120467 +0100
|
|
+++ cups-1.4.3/backend/snmp.c 2010-05-11 17:31:16.267120141 +0100
|
|
@@ -195,6 +195,7 @@ static const int LexmarkProductOID[] = {
|
|
static const int LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
|
|
static const int LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
|
|
static const int HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
|
|
+static const int RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 };
|
|
static const int XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
|
|
static cups_array_t *DeviceURIs = NULL;
|
|
static int HostNameLookups = 0;
|
|
@@ -1002,6 +1003,9 @@ read_snmp_response(int fd) /* I - SNMP
|
|
packet.community, CUPS_ASN1_GET_REQUEST,
|
|
DEVICE_ID, LexmarkDeviceIdOID);
|
|
_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
|
|
+ packet.community, CUPS_ASN1_GET_REQUEST,
|
|
+ DEVICE_ID, RicohDeviceIdOID);
|
|
+ _cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
|
|
packet.community, CUPS_ASN1_GET_REQUEST,
|
|
DEVICE_PRODUCT, XeroxProductOID);
|
|
_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
|