From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Fri, 29 Aug 2014 11:27:18 +0000 (+0000)
Subject: Make sure CachDir is only readable by root and lp.
X-Git-Tag: v2.2b1~494
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6ca7b7a8e75652964b7938985f1270202debe8fb;p=thirdparty%2Fcups.git

Make sure CachDir is only readable by root and lp.


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

diff --git a/scheduler/Makefile b/scheduler/Makefile
index 5e3750c1b2..ce1606b1e2 100644
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -171,7 +171,7 @@ install-data:
 	echo Creating $(REQUESTS)/tmp...
 	$(INSTALL_DIR) -m 1770 -g $(CUPS_GROUP) $(REQUESTS)/tmp
 	echo Creating $(CACHEDIR)...
-	$(INSTALL_DIR) -m 775 -g $(CUPS_GROUP) $(CACHEDIR)
+	$(INSTALL_DIR) -m 770 -g $(CUPS_GROUP) $(CACHEDIR)
 	if test "x$(INITDIR)" != x; then \
 		echo Installing init scripts...; \
 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
diff --git a/scheduler/conf.c b/scheduler/conf.c
index 529900084b..905bbd11a3 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1076,7 +1076,7 @@ cupsdReadConfiguration(void)
 
   if ((cupsdCheckPermissions(RequestRoot, NULL, 0710, RunUser,
 			     Group, 1, 1) < 0 ||
-       cupsdCheckPermissions(CacheDir, NULL, 0775, RunUser,
+       cupsdCheckPermissions(CacheDir, NULL, 0770, RunUser,
 			     Group, 1, 1) < 0 ||
        cupsdCheckPermissions(temp, NULL, 0775, RunUser,
 			     Group, 1, 1) < 0 ||