From 1c6d031a3c50532e0b31aa55fe5af6bf08664697 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Dec 03 2009 10:06:20 +0000
Subject: - Undo last change as it was incorrect.


---

diff --git a/cups-str3413.patch b/cups-str3413.patch
new file mode 100644
index 0000000..ea2872a
--- /dev/null
+++ b/cups-str3413.patch
@@ -0,0 +1,42 @@
+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...
diff --git a/cups.spec b/cups.spec
index 8b92bf1..76b6e5f 100644
--- a/cups.spec
+++ b/cups.spec
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -61,6 +61,7 @@ Patch33: cups-str3407.patch
 Patch34: cups-str3418.patch
 Patch35: cups-CVE-2009-3553.patch
 Patch36: cups-str3422.patch
+Patch37: cups-str3413.patch
 
 Patch100: cups-lspp.patch
 
@@ -230,6 +231,7 @@ module.
 %patch34 -p1 -b .str3418
 %patch35 -p1 -b .CVE-2009-3553
 %patch36 -p1 -b .str3422
+%patch37 -p1 -b .str3413
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -530,6 +532,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Thu Dec  3 2009 Tim Waugh <twaugh@redhat.com> - 1:1.4.2-11
+- Fixes for SNMP scanning with Lexmark printers (bug #542857, STR #3413).
+
 * Mon Nov 23 2009 Tim Waugh <twaugh@redhat.com> 1:1.4.2-10
 - Undo last change as it was incorrect.