The scheduler will no longer run programs with group write permission.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@9940 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES.txt b/CHANGES.txt
index 58b9973db4eea4fe54e09e081370c0d92de0b15b..8bca378935f08e33dfb3013dc978685ba21ad0d0 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,9 @@
-CHANGES.txt - 1.6b1 - 2011-08-27
+CHANGES.txt - 1.6b1 - 2011-08-30
 --------------------------------
 
 CHANGES IN CUPS V1.6b1
 
+       - The scheduler will no longer run programs with group write permission.
        - The PHP module has been removed (STR #3932)
        - The bannertops, commandtoescpx, commandtopclx, imagetops,
          imagetoraster, pdftops, rastertoescpx, rastertopclx, and texttops

diff --git a/cups/file.c b/cups/file.c
index 25b07f21ece9c3250129eedd122a7f58bc2b9df7..560518ff61434340fac227982e9405a8f9412911 100644 (file)
--- a/cups/file.c
+++ b/cups/file.c
@@ -167,19 +167,13 @@ _cupsFileCheck(
   * Verify permission of the file itself:
   *
   * 1. Must be owned by root
-  * 2. Must not be writable by group unless group is root/wheel/admin
+  * 2. Must not be writable by group
   * 3. Must not be setuid
   * 4. Must not be writable by others
   */
 
   if (fileinfo.st_uid ||               /* 1. Must be owned by root */
-#ifdef __APPLE__
-      ((fileinfo.st_mode & S_IWGRP) && fileinfo.st_gid &&
-       fileinfo.st_gid != 80) ||       /* 2. Must not be writable by group */
-#else
-      ((fileinfo.st_mode & S_IWGRP) && fileinfo.st_gid) ||
-                                       /* 2. Must not be writable by group */
-#endif /* __APPLE__ */
+      (fileinfo.st_mode & S_IWGRP)  || /* 2. Must not be writable by group */
       (fileinfo.st_mode & S_ISUID) ||  /* 3. Must not be setuid */
       (fileinfo.st_mode & S_IWOTH))    /* 4. Must not be writable by others */
   {
@@ -218,13 +212,7 @@ _cupsFileCheck(
   }
 
   if (fileinfo.st_uid ||               /* 1. Must be owned by root */
-#ifdef __APPLE__
-      ((fileinfo.st_mode & S_IWGRP) && fileinfo.st_gid &&
-       fileinfo.st_gid != 80) ||       /* 2. Must not be writable by group */
-#else
-      ((fileinfo.st_mode & S_IWGRP) && fileinfo.st_gid) ||
-                                       /* 2. Must not be writable by group */
-#endif /* __APPLE__ */
+      (fileinfo.st_mode & S_IWGRP) ||  /* 2. Must not be writable by group */
       (fileinfo.st_mode & S_ISUID) ||  /* 3. Must not be setuid */
       (fileinfo.st_mode & S_IWOTH))    /* 4. Must not be writable by others */
   {