From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Thu, 29 Jan 2015 20:25:06 +0000 (+0000)
Subject: Drop support for "Sandboxing off" when running as root on OS X.
X-Git-Tag: v2.2b1~372
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb5c9ea320b2e61434aaab5d41db95ae08d9e8ac;p=thirdparty%2Fcups.git

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 0c63e5441b..71d952ff14 100644
--- 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 352546e850..78b3694391 100644
--- 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);