The scheduler did not honor the FatalErrors directive for mis-configured Group

and SystemGroup values (STR #4495)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12223 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES-2.0.txt b/CHANGES-2.0.txt
index 157be2ae2cbb3f22ae55ec8fa689114f45af7586..a6ef2755cc8d094a5373fde6d1d6b46cedd30b42 100644 (file)
--- a/CHANGES-2.0.txt
+++ b/CHANGES-2.0.txt
@@ -12,6 +12,8 @@ CHANGES IN CUPS V2.0.1
          (STR #4492)
        - Fixed a crash in ippAttributeString (<rdar://problem/17903871>)
        - Added systemd support for cups-lpd (STR #4493)
+       - The scheduler did not honor the FatalErrors directive for mis-
+         configured Group and SystemGroup values (STR #4495)
        - RPMs did not build (STR #4490)
 
 

diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
index f3f702321a06c13c586806e787b260fd3d40de61..71683a6549c466c1a1a654dd568d86ac844cd5a6 100644 (file)
--- a/conf/cups-files.conf.in
+++ b/conf/cups-files.conf.in
@@ -15,6 +15,7 @@
 #Group @CUPS_GROUP@
 
 # Administrator user group, used to match @SYSTEM in cupsd.conf policy rules...
+# This cannot contain the Group value for security reasons...
 SystemGroup @CUPS_SYSTEM_GROUPS@
 @CUPS_SYSTEM_AUTHKEY@
 

diff --git a/scheduler/conf.c b/scheduler/conf.c
index 4b8f87e1419e1196bb54939eb5d0303527861276..9f22b400884d797ddd838be33628346a69596c77 100644 (file)
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -995,6 +995,9 @@ cupsdReadConfiguration(void)
 
       cupsdLogMessage(CUPSD_LOG_NOTICE,
                       "Group and SystemGroup cannot use the same groups.");
+      if (FatalErrors & (CUPSD_FATAL_CONFIG | CUPSD_FATAL_PERMISSIONS))
+        return (0);
+
       cupsdLogMessage(CUPSD_LOG_INFO, "Resetting Group to \"nobody\"...");
 
       group = getgrnam("nobody");
@@ -2946,7 +2949,7 @@ read_cupsd_conf(cups_file_t *fp)  /* I - File to read from */
 
        for (start = value; *start; start = end)
        {
-        /* 
+        /*
          * Find end of keyword...
          */