rpms/cups/FC-5 cups-localhost.patch,NONE,1.1 cups.spec,1.181,1.182

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26333

Modified Files:
	cups.spec 
Added Files:
	cups-localhost.patch 
Log Message:
* Wed May 24 2006 Tim Waugh <twaugh at redhat.com>
- Fix 'localhost' fallback in httpAddrGetList() (bug #192628, STR #1723).


cups-localhost.patch:
 http-addrlist.c |   12 ++++++++++++
 1 files changed, 12 insertions(+)

--- NEW FILE cups-localhost.patch ---
--- cups-1.2.1/cups/http-addrlist.c.localhost	2006-05-24 16:55:15.000000000 +0100
+++ cups-1.2.1/cups/http-addrlist.c	2006-05-24 16:56:11.000000000 +0100
@@ -506,6 +506,9 @@
 	temp->addr.ipv6.sin6_addr.s6_addr32[3] = htonl(1);
 #  endif /* WIN32 */
 
+        if (!first)
+          first = temp;
+
         addr = temp;
       }
 
@@ -527,6 +530,9 @@
 	temp->addr.ipv4.sin_port        = htons(portnum);
 	temp->addr.ipv4.sin_addr.s_addr = htonl(0x7f000001);
 
+        if (!first)
+          first = temp;
+
         if (addr)
 	  addr->next = temp;
 	else
@@ -556,6 +562,9 @@
         temp->addr.ipv6.sin6_family = AF_INET6;
 	temp->addr.ipv6.sin6_port   = htons(portnum);
 
+        if (!first)
+          first = temp;
+
         addr = temp;
       }
 
@@ -576,6 +585,9 @@
         temp->addr.ipv4.sin_family = AF_INET;
 	temp->addr.ipv4.sin_port   = htons(portnum);
 
+        if (!first)
+          first = temp;
+
         if (addr)
 	  addr->next = temp;
 	else


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- cups.spec	23 May 2006 09:08:53 -0000	1.181
+++ cups.spec	24 May 2006 16:29:43 -0000	1.182
@@ -34,6 +34,7 @@
 Patch11: cups-str1705.patch
 Patch12: cups-locale.patch
 Patch13: cups-CAN-2005-0064.patch
+Patch14: cups-localhost.patch
 Patch16: cups-pie.patch
 Patch18: cups-language.patch
 Patch20: cups-direct-usb.patch
@@ -130,6 +131,7 @@
 %patch11 -p1 -b .str1705
 %patch12 -p1 -b .locale
 %patch13 -p1 -b .CAN-2005-0064
+%patch14 -p1 -b .localhost
 %if %build_as_pie
 %patch16 -p1 -b .pie
 %endif
@@ -403,6 +405,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed May 24 2006 Tim Waugh <twaugh at redhat.com>
+- Fix 'localhost' fallback in httpAddrGetList() (bug #192628, STR #1723).
+
 * Tue May 23 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-1.2
 - Make the usb backend run as root as well (bug #192805).  Another symptom
   of bug #192585.