Drop support for "Sandboxing off" when running as root on OS X.

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

diff --git a/man/cups-files.conf.man.in b/man/cups-files.conf.man.in
index 0c63e5441b65194db0bf641717dcda5e2a7803a6..71d952ff1400f9117b8fc3ad2b5e7bb29a0bcdd4 100644 (file)
--- a/man/cups-files.conf.man.in
+++ b/man/cups-files.conf.man.in
@@ -157,8 +157,6 @@ Specifies the directory that contains print jobs and other HTTP request data.
 The default is "/var/spool/cups".
 .\"#Sandboxing
 .TP 5
-\fBSandboxing off\fR
-.TP 5
 \fBSandboxing relaxed\fR
 .TP 5
 \fBSandboxing strict\fR

diff --git a/scheduler/conf.c b/scheduler/conf.c
index 352546e850999fcf29ee8afbe30544678b0cf768..78b36943911ed035c433f5f91d0ff31f8b66e475 100644 (file)
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -3470,7 +3470,7 @@ read_cups_files_conf(cups_file_t *fp)     /* I - File to read from */
       * Level of sandboxing?
       */
 
-      if (!_cups_strcasecmp(value, "off"))
+      if (!_cups_strcasecmp(value, "off") && getuid())
       {
         Sandboxing = CUPSD_SANDBOXING_OFF;
         cupsdLogMessage(CUPSD_LOG_WARN, "Disabling sandboxing is not recommended (line %d of %s)", linenum, CupsFilesFile);