rpms/cups/devel cups-str1758.patch,NONE,1.1 cups.spec,1.211,1.212

[fedora-cvs-commits at redhat.com]

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-str1758.patch 
Log Message:
* Wed Jun  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-8
- Fix 'Allow from @IF(...)' (STR #1758, bug #187703).


cups-str1758.patch:
 auth.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE cups-str1758.patch ---
--- cups-1.2.1/scheduler/auth.c.iface	2006-06-07 15:34:01.000000000 +0100
+++ cups-1.2.1/scheduler/auth.c	2006-06-07 15:34:56.000000000 +0100
@@ -869,9 +869,12 @@
 	    */
 
 	    for (iface = (cupsd_netif_t *)cupsArrayFirst(NetIFList);
-	         iface && !strcmp(masks->mask.name.name, iface->name);
+	         iface;
 		 iface = (cupsd_netif_t *)cupsArrayNext(NetIFList))
 	    {
+              if (strcmp(masks->mask.name.name, iface->name))
+                continue;
+
               if (iface->address.addr.sa_family == AF_INET)
 	      {
 	       /*


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- cups.spec	7 Jun 2006 12:57:42 -0000	1.211
+++ cups.spec	7 Jun 2006 14:56:31 -0000	1.212
@@ -32,6 +32,7 @@
 Patch10: cups-str1740.patch
 Patch11: cups-serverbin-compat.patch
 Patch12: cups-locale.patch
+Patch13: cups-str1758.patch
 Patch18: cups-language.patch
 Patch20: cups-direct-usb.patch
 Patch22: cups-dest-cache-v2.patch
@@ -123,6 +124,7 @@
 %patch10 -p1 -b .str1740
 %patch11 -p1 -b .serverbin-compat
 %patch12 -p1 -b .locale
+%patch13 -p1 -b .str1758
 %patch18 -p1 -b .language
 %patch20 -p1 -b .direct-usb
 %patch22 -p1 -b .dest-cache-v2
@@ -385,6 +387,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Jun  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-8
+- Fix 'Allow from @IF(...)' (STR #1758, bug #187703).
+
 * Wed Jun  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-7
 - ServerBin compatibility patch (bug #194005).