rpms/cups/devel cups-str2650.patch,NONE,1.1 cups.spec,1.377,1.378

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9196

Modified Files:
	cups.spec 
Added Files:
	cups-str2650.patch 
Log Message:
* Wed Jan  9 2008 Tim Waugh <twaugh at redhat.com>
- Applied upstream patch to fix cupsctl --remote-any (bug #421411, STR #2650).


cups-str2650.patch:

--- NEW FILE cups-str2650.patch ---
diff -up cups-1.3.5/cups/adminutil.c.str2650 cups-1.3.5/cups/adminutil.c
--- cups-1.3.5/cups/adminutil.c.str2650	2007-11-30 07:00:59.000000000 +0000
+++ cups-1.3.5/cups/adminutil.c	2008-01-09 12:14:45.000000000 +0000
@@ -1057,7 +1057,7 @@ _cupsAdminGetServerSettings(
 	in_admin_location = 0;
 	in_location       = 0;
       }
-      else if (!strcasecmp(line, "Allow") && in_admin_location &&
+      else if (!strcasecmp(line, "Allow") &&
                strcasecmp(value, "localhost") && strcasecmp(value, "127.0.0.1")
 #ifdef AF_LOCAL
 	       && *value != '/'
@@ -1067,9 +1067,9 @@ _cupsAdminGetServerSettings(
 #endif /* AF_INET6 */
 	       )
       {
-	remote_admin = 1;
-
-	if (!strcasecmp(value, "all"))
+        if (in_admin_location)
+	  remote_admin = 1;
+        else if (!strcasecmp(value, "all"))
 	  remote_any = 1;
       }
       else if (line[0] != '<' && !in_location && !in_policy)


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.377
retrieving revision 1.378
diff -u -r1.377 -r1.378
--- cups.spec	3 Jan 2008 16:17:10 -0000	1.377
+++ cups.spec	9 Jan 2008 12:17:54 -0000	1.378
@@ -40,6 +40,7 @@
 Patch14: cups-lpr-help.patch
 Patch16: cups-pid.patch
 Patch17: cups-foomatic-recommended.patch
+Patch18: cups-str2650.patch
 Patch19: cups-eggcups.patch
 Patch20: cups-getpass.patch
 Patch21: cups-driverd-timeout.patch
@@ -150,6 +151,7 @@
 %patch14 -p1 -b .lpr-help
 %patch16 -p1 -b .pid
 %patch17 -p1 -b .foomatic-recommended
+%patch18 -p1 -b .str2650
 %patch19 -p1 -b .eggcups
 %patch20 -p1 -b .getpass
 %patch21 -p1 -b .driverd-timeout
@@ -445,6 +447,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Jan  9 2008 Tim Waugh <twaugh at redhat.com>
+- Applied upstream patch to fix cupsctl --remote-any (bug #421411, STR #2650).
+
 * Thu Jan  3 2008 Tim Waugh <twaugh at redhat.com>
 - Efficiency fix for pstoraster (bug #416871).