rpms/cups/devel cups-str1521.patch,NONE,1.1 cups.spec,1.145,1.146

[fedora-cvs-commits at redhat.com]

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-str1521.patch 
Log Message:
* Wed Mar 29 2006 Tim Waugh <twaugh at redhat.com>
- Fix group list of non-root backends (STR #1521, bug #186954).


cups-str1521.patch:
 conf.c |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 deletions(-)

--- NEW FILE cups-str1521.patch ---
--- cups-1.2rc1/scheduler/conf.c.str1521	2006-03-14 11:54:45.000000000 +0000
+++ cups-1.2rc1/scheduler/conf.c	2006-03-30 10:09:57.000000000 +0100
@@ -338,22 +338,34 @@
   endpwent();
 
  /*
-  * Find the default group (nobody)...
+  * Find the default group...
   */
 
-  group = getgrnam("nobody");
+  group = getgrnam(CUPS_DEFAULT_GROUP);
   endgrent();
 
-  if (group != NULL)
+  if (group)
     Group = group->gr_gid;
   else
   {
    /*
-    * Use the (historical) NFS nobody group ID (-2 as a 16-bit twos-
-    * complement number...)
+    * Fallback to group "nobody"...
     */
 
-    Group = 65534;
+    group = getgrnam("nobody");
+    endgrent();
+
+    if (group)
+      Group = group->gr_gid;
+    else
+    {
+     /*
+      * Use the (historical) NFS nobody group ID (-2 as a 16-bit twos-
+      * complement number...)
+      */
+
+      Group = 65534;
+    }
   }
 
  /*


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- cups.spec	28 Mar 2006 16:32:33 -0000	1.145
+++ cups.spec	30 Mar 2006 09:31:05 -0000	1.146
@@ -31,8 +31,10 @@
 Patch8: cups-logfileperm.patch
 Patch9: cups-1.1.17-rcp.patch
 Patch10: cups-1.1.17-ppdsdat.patch
+Patch11: cups-parallel.patch
 Patch12: cups-locale.patch
 Patch13: cups-CAN-2005-0064.patch
+Patch14: cups-str1521.patch
 Patch16: cups-pie.patch
 Patch17: cups-1.1.19-no_rpath.patch
 Patch18: cups-language.patch
@@ -118,8 +120,10 @@
 %patch8 -p1 -b .logfileperm
 %patch9 -p1 -b .rcp
 %patch10 -p1 -b .ppdsdat
+%patch11 -p1 -b .parallel
 %patch12 -p1 -b .locale
 %patch13 -p1 -b .CAN-2005-0064
+%patch14 -p1 -b .str1521
 %if %build_as_pie
 %patch16 -p1 -b .pie
 %endif
@@ -375,6 +379,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Mar 29 2006 Tim Waugh <twaugh at redhat.com>
+- Fix group list of non-root backends (STR #1521, bug #186954).
+
 * Tue Mar 28 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.2
 - Fix lpq -h (STR#1515, bug #186686).