rpms/cups/devel cups-str3413.patch,NONE,1.1 cups.spec,1.547,1.548
Tim Waugh
twaugh at fedoraproject.org
Thu Dec 3 23:09:28 UTC 2009
Author: twaugh
Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26207
Modified Files:
cups.spec
Added Files:
cups-str3413.patch
Log Message:
* Thu Dec 3 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-12
- Fixes for SNMP scanning with Lexmark printers (bug #542857, STR #3413).
cups-str3413.patch:
snmp.c | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
--- NEW FILE cups-str3413.patch ---
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 2009-12-03 10:01:27.933335209 +0000
@@ -999,7 +999,7 @@ read_snmp_response(int fd) /* I - SNMP
DEVICE_PRODUCT, LexmarkProductOID2);
_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
packet.community, CUPS_ASN1_GET_REQUEST,
- DEVICE_URI, LexmarkDeviceIdOID);
+ DEVICE_ID, LexmarkDeviceIdOID);
_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
packet.community, CUPS_ASN1_GET_REQUEST,
DEVICE_PRODUCT, XeroxProductOID);
@@ -1064,7 +1064,19 @@ read_snmp_response(int fd) /* I - SNMP
if (device->id)
+ {
+ if (strlen (device->id) >
+ strlen ((char *)packet.object_value.string.bytes))
+ {
+ /*
+ * The Device ID we already saw was more complete.
+ */
+
+ 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 :
if (device && packet.object_type == CUPS_ASN1_OCTET_STRING &&
- !device->uri)
+ !device->uri &&
+ (char *)packet.object_value.string.bytes[0] != '\0')
{
/*
* Update an existing cache entry...
Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.547
retrieving revision 1.548
diff -u -p -r1.547 -r1.548
--- cups.spec 3 Dec 2009 23:05:53 -0000 1.547
+++ cups.spec 3 Dec 2009 23:09:28 -0000 1.548
@@ -9,7 +9,7 @@
Summary: Common Unix Printing System
Name: cups
Version: 1.4.2
-Release: 11%{?dist}
+Release: 12%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -522,7 +522,7 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so
%changelog
-* Thu Dec 3 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-11
+* Thu Dec 3 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-12
- Fixes for SNMP scanning with Lexmark printers (bug #542857, STR #3413).
* Mon Nov 23 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.2-10
More information about the scm-commits
mailing list