diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2015-01-29 20:25:06 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2015-01-29 20:25:06 +0000 |
| commit | eb5c9ea320b2e61434aaab5d41db95ae08d9e8ac (patch) | |
| tree | 87fb9b1ca644c6a72f3fd3a4e14d19381cea10aa | |
| parent | f099325eb21961ffe8f3d1141cc3684beb443205 (diff) | |
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
| -rw-r--r-- | man/cups-files.conf.man.in | 2 | ||||
| -rw-r--r-- | scheduler/conf.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/man/cups-files.conf.man.in b/man/cups-files.conf.man.in index 0c63e5441..71d952ff1 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 352546e85..78b369439 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); |