summaryrefslogtreecommitdiff
path: root/debian/patches/confdirperms.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/confdirperms.patch')
-rw-r--r--debian/patches/confdirperms.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/debian/patches/confdirperms.patch b/debian/patches/confdirperms.patch
new file mode 100644
index 000000000..524090f2b
--- /dev/null
+++ b/debian/patches/confdirperms.patch
@@ -0,0 +1,28 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:41 +0200
+Subject: Do not mess with the permissions of cupsd.conf.
+
+Last-Update: 2015-02-10
+
+Patch-Name: confdirperms.patch
+---
+ scheduler/conf.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index b73d33f..31eedbf 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void)
+ Group, 1, 1) < 0 ||
+ cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
+ Group, 1, 0) < 0 ||
++ /* Never alter permissions of central conffile
+ cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
+ Group, 0, 0) < 0 ||
+ cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
+ Group, 0, 0) < 0 ||
++ */
+ cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
+ Group, 0, 0) < 0 ||
+ cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,