rpms/cups
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Use upstream fix for SNMP detection (bug #542857, STR #3413).

Browse Source
This commit is contained in:
Tim Waugh 2009-12-08 10:57:19 +00:00
parent 23771f0684
commit f3531893f4
2 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
cups-str3413.patch
View File

@ -1,6 +1,6 @@
diff -up cups-1.4.2/backend/snmp.c.str3413 cups-1.4.2/backend/snmp.c diff -up cups-1.4.2/backend/snmp.c.str3413 cups-1.4.2/backend/snmp.c
--- cups-1.4.2/backend/snmp.c.str3413 2009-01-14 22:40:58.000000000 +0000 --- cups-1.4.2/backend/snmp.c.str3413 2009-01-14 22:40:58.000000000 +0000
+++ cups-1.4.2/backend/snmp.c 2009-12-03 10:01:27.933335209 +0000 +++ cups-1.4.2/backend/snmp.c 2009-12-08 10:54:11.798515550 +0000
@@ -999,7 +999,7 @@ read_snmp_response(int fd) /* I - SNMP @@ -999,7 +999,7 @@ read_snmp_response(int fd) /* I - SNMP
DEVICE_PRODUCT, LexmarkProductOID2); DEVICE_PRODUCT, LexmarkProductOID2);
_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1, _cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
@ -10,33 +10,24 @@ diff -up cups-1.4.2/backend/snmp.c.str3413 cups-1.4.2/backend/snmp.c
_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1, _cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
packet.community, CUPS_ASN1_GET_REQUEST, packet.community, CUPS_ASN1_GET_REQUEST,
DEVICE_PRODUCT, XeroxProductOID); DEVICE_PRODUCT, XeroxProductOID);
@@ -1064,7 +1064,19 @@ read_snmp_response(int fd) /* I - SNMP @@ -1054,7 +1054,9 @@ read_snmp_response(int fd) /* I - SNMP
break;
case DEVICE_ID :
if (device->id) - if (device && packet.object_type == CUPS_ASN1_OCTET_STRING)
+ { + if (device && packet.object_type == CUPS_ASN1_OCTET_STRING &&
+ if (strlen (device->id) > + (!device->id ||
+ strlen ((char *)packet.object_value.string.bytes)) + strlen(device->id) < packet.object_value.string.num_bytes))
+ { {
+ /* /*
+ * The Device ID we already saw was more complete. * Update an existing cache entry...
+ */ @@ -1107,7 +1109,7 @@ read_snmp_response(int fd) /* I - SNMP
+
+ break;
+ }
+
free(device->id);
+ }
device->id = strdup((char *)packet.object_value.string.bytes);
@@ -1107,7 +1119,8 @@ read_snmp_response(int fd) /* I - SNMP
case DEVICE_URI : case DEVICE_URI :
if (device && packet.object_type == CUPS_ASN1_OCTET_STRING && if (device && packet.object_type == CUPS_ASN1_OCTET_STRING &&
- !device->uri) - !device->uri)
+ !device->uri && + !device->uri && packet.object_value.string.num_bytes > 0)
+ (char *)packet.object_value.string.bytes[0] != '\0')
{ {
/* /*
* Update an existing cache entry... * Update an existing cache entry...
diff -up cups-1.4.2/CHANGES-1.4.txt.str3413 cups-1.4.2/CHANGES-1.4.txt

1
cups.spec
View File

@ -532,6 +532,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Tue Dec 8 2009 Tim Waugh <twaugh@redhat.com> - 1:1.4.2-14 * Tue Dec 8 2009 Tim Waugh <twaugh@redhat.com> - 1:1.4.2-14
- Use upstream fix for SNMP detection (bug #542857, STR #3413).
- Use the text filter for text/css files (bug #545026, STR #3442). - Use the text filter for text/css files (bug #545026, STR #3442).
- Show conflicting option values in web UI (bug #544326, STR #3440). - Show conflicting option values in web UI (bug #544326, STR #3440).
- Use upstream fix for adjustment of conflicting options - Use upstream fix for adjustment of conflicting options